Prepare a 1.1.0 release.

plus signs are valid in debian/ubuntu package versions

.travis.yml

@@ -7,7 +7,7 @@ bundler_args: --without development
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 after_success:
   - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-  - .forge-releng/publish
+  - .forge-release/publish
 rvm:
 - 1.8.7
 - 1.9.3

CHANGELOG

@@ -1,3 +1,23 @@
+2014-01-06 - Version 1.1.0
+
+Summary:
+
+Primarily a release for Ubuntu users!
+
+Features:
+- Add support for Ubuntu Saucy (13.10)
+- Add `java_home` parameter for centralized setting of JAVA_HOME.
+
+Bugfixes:
+- Plus signs are valid in debian/ubuntu package names.
+
+
+
+1.0.2 ()
+
+Brett Porter <brett@apache.org>
+* Support Scientific Linux
+
 1.0.1 (2013-08-01)
 
 Matthaus Owens <matthaus@puppetlabs.com>

Modulefile

@@ -1,5 +1,5 @@
 name         'puppetlabs-java'
-version      '1.0.1'
+version      '1.1.0'
 source       'git://github.com/puppetlabs/puppetlabs-java'
 author       'puppetlabs'
 license      'Apache'

manifests/init.pp

@@ -46,12 +46,13 @@ class java(
 ) {
   include java::params
 
-  validate_re($version, 'present|installed|latest|^[._0-9a-zA-Z:-]+$')
+  validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:-]+$')
 
   if has_key($java::params::java, $distribution) {
     $default_package_name     = $java::params::java[$distribution]['package']
     $default_alternative      = $java::params::java[$distribution]['alternative']
     $default_alternative_path = $java::params::java[$distribution]['alternative_path']
+    $java_home                = $java::params::java[$distribution]['java_home']
   } else {
     fail("Java distribution ${distribution} is not supported.")
   }

manifests/params.pp

@@ -17,7 +17,7 @@ class java::params {
     'RedHat': {
       case $::operatingsystem {
         default: { fail("unsupported os ${::operatingsystem}") }
-        'RedHat', 'CentOS', 'OracleLinux': {
+        'RedHat', 'CentOS', 'OracleLinux', 'Scientific': {
           if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
             $jdk_package = 'java-1.6.0-sun-devel'
             $jre_package = 'java-1.6.0-sun'
@@ -54,45 +54,53 @@ class java::params {
               'package'          => 'openjdk-6-jdk',
               'alternative'      => 'java-6-openjdk',
               'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/java-6-openjdk/jre/',
             },
             'jre' => {
               'package'          => 'openjdk-6-jre-headless',
               'alternative'      => 'java-6-openjdk',
               'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/java-6-openjdk/jre/',
             },
             'sun-jre' => {
               'package'          => 'sun-java6-jre',
               'alternative'      => 'java-6-sun',
               'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/java-6-sun/jre/',
             },
             'sun-jdk' => {
               'package'          => 'sun-java6-jdk',
               'alternative'      => 'java-6-sun',
               'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/java-6-sun/jre/',
             },
           }
         }
-        'wheezy', 'precise','quantal','raring': {
+        'wheezy', 'precise','quantal','raring','saucy': {
           $java =  {
             'jdk' => {
               'package'          => 'openjdk-7-jdk',
               'alternative'      => "java-1.7.0-openjdk-${::architecture}",
               'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/",
             },
             'jre' => {
               'package'          => 'openjdk-7-jre-headless',
               'alternative'      => "java-1.7.0-openjdk-${::architecture}",
               'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/",
             },
             'oracle-jre' => {
               'package'          => 'oracle-j2re1.7',
               'alternative'      => 'j2re1.7-oracle',
               'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java',
+              'java_home'        => '/usr/lib/jvm/j2re1.7-oracle/',
             },
             'oracle-jdk' => {
               'package'          => 'oracle-j2sdk1.7',
               'alternative'      => 'j2sdk1.7-oracle',
               'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java',
+              'java_home'        => '/usr/lib/jvm/j2sdk1.7-oracle/jre/',
             },
           }
         }

spec/classes/java_spec.rb

@@ -101,6 +101,12 @@ describe 'java', :type => :class do
     it { should contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
+  context 'select passed value for Scientific Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
   context 'select default for OpenSUSE 12.3' do
     let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
     it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}