Merge pull request #212 from puppetlabs/hunner_msync

(MODULES-4098) Sync the rest of the files
This commit is contained in:
Eric Putnam
2017-01-20 15:48:52 -08:00
committed by GitHub
9 changed files with 55 additions and 35 deletions

12
.gitignore vendored
View File

@@ -1,12 +1,24 @@
#This file is generated by ModuleSync, do not edit. #This file is generated by ModuleSync, do not edit.
pkg/ pkg/
Gemfile.lock Gemfile.lock
Gemfile.local
vendor/ vendor/
spec/fixtures/manifests/ spec/fixtures/manifests/
spec/fixtures/modules/ spec/fixtures/modules/
log/
junit/
.vagrant/ .vagrant/
.bundle/ .bundle/
coverage/ coverage/
log/ log/
.idea/ .idea/
.metadata
*.iml *.iml
.*.sw[op]
.yardoc
.yardwarns
.DS_Store
tmp/
vendor/
doc/

23
.project Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>puppetlabs-java</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>

View File

@@ -1,20 +1,5 @@
--- ---
.travis.yml: appveyor.yml:
includes: delete: true
- rvm: 2.3.1
env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
bundler_args: --without system_tests
- rvm: 2.1.9
env: PUPPET_GEM_VERSION="~> 4.0" STDLIB_LOG_DEPRECATIONS="false"
bundler_args: --without system_tests
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
bundler_args: --without system_tests
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
bundler_args: --without system_tests
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
bundler_args: --without system_tests
spec/spec_helper.rb: spec/spec_helper.rb:
allow_deprecations: true allow_deprecations: true

View File

@@ -43,7 +43,7 @@ Checklist (and a short version for the impatient)
- Make sure you have a [GitHub account](https://github.com/join) - Make sure you have a [GitHub account](https://github.com/join)
- [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for. - [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
* Preferred method: * Preferred method:
@@ -215,4 +215,3 @@ Additional Resources
* [General GitHub documentation](http://help.github.com/) * [General GitHub documentation](http://help.github.com/)
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

10
Gemfile
View File

@@ -49,15 +49,13 @@ group :development do
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
gem 'rainbow', '< 2.2.0', :require => false
end end
group :system_tests do group :system_tests do
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20') if supports_windows gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')
gem 'beaker', *location_for(ENV['BEAKER_VERSION']) if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0') and ! supports_windows gem 'beaker-pe', :require => false
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '< 3') if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0') and ! supports_windows gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])
gem 'beaker-pe', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4') if ! supports_windows
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1') if supports_windows
gem 'beaker-puppet_install_helper', :require => false gem 'beaker-puppet_install_helper', :require => false
gem 'beaker-module_install_helper', :require => false gem 'beaker-module_install_helper', :require => false
gem 'master_manipulator', :require => false gem 'master_manipulator', :require => false

6
MAINTAINERS.md Normal file
View File

@@ -0,0 +1,6 @@
## Maintenance
Maintainers:
- Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `java`.

7
NOTICE
View File

@@ -1,9 +1,6 @@
java puppet module Puppet Module - puppetlabs-java
Copyright (C) 2011-2016 Puppet Labs, Inc.
Puppet Labs can be contacted at: info@puppetlabs.com
Copyright 2017 Puppet, Inc.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

View File

@@ -1,10 +1,9 @@
require 'puppet_blacksmith/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppetlabs_spec_helper/rake_tasks' require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('relative') PuppetLint.configuration.send('relative')
PuppetLint.configuration.send('disable_documentation')
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
desc 'Generate pooler nodesets' desc 'Generate pooler nodesets'
task :gen_nodeset do task :gen_nodeset do

1
appveyor.yml Normal file
View File

@@ -0,0 +1 @@
# Appveyor is only enabled on modules that support windows