Merge pull request puppetlabs#216 from tphoney/fix_oracle_spec

Helen · web-flow · commit ebb30f1ef546 · 2017-02-24T11:38:40.000Z
pinning to archive 1.2.0, for puppet 3 compat
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,6 +1,8 @@
 fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    archive: "git://github.com/voxpupuli/puppet-archive.git"
+    archive:
+      repo: "git://github.com/voxpupuli/puppet-archive.git"
+      ref: "v1.2.0"
   symlinks:
     java: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
@@ -34,8 +34,5 @@ matrix:
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false
diff --git a/metadata.json b/metadata.json
@@ -88,6 +88,7 @@
     }
   ],
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"}
+    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
+    {"name":"puppet/archive","version_requirement":">= 1.1.0 < 1.2.0"}
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@`
`88`	`88`	`}`
`89`	`89`	`],`
`90`	`90`	`"dependencies": [`
`91`		`- {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"}`
	`91`	`+ {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},`
	`92`	`+ {"name":"puppet/archive","version_requirement":">= 1.1.0 < 1.2.0"}`
`92`	`93`	`]`
`93`	`94`	`}`