jruby · Apr 11, 2017 · Apr 11, 2017 · Apr 11, 2017
Showing with 60 additions and 11 deletions.

+1 −1 .mvn/extensions.xml

+15 −2 core/pom.rb

+26 −2 core/pom.xml

+3 −1 lib/pom.rb

+13 −3 lib/pom.xml

+1 −1 pom.rb

+1 −1 pom.xml
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.15</version>
+    <version>0.1.20-SNAPSHOT</version>
   </extension>
 </extensions>
diff --git a/core/pom.rb b/core/pom.rb
@@ -166,8 +166,8 @@
           'compilerArgs' => { 'arg' => '-J-Xmx1G' },
           'showWarnings' => 'true',
           'showDeprecation' => 'true',
-          'source' => [ '${base.java.version}', '1.7' ],
-          'target' => [ '${base.javac.version}', '1.7' ],
+          'source' => '${base.java.version}',
+          'target' => '${base.javac.version}',
           'useIncrementalCompilation' =>  'false' ) do
     execute_goals( 'compile',
                    :id => 'anno',
@@ -380,6 +380,19 @@
 
   end
 
+  # TODO change to 1.9 when running with jdk9 as soon as core builds
+  #      with jdk9
+  { '52.0': '1.8', '53.0': '1.9' }.each do |class_version, java_version|
+    profile "#{class_version}" do
+      activation do
+        property name: 'java.class.version', value: class_version
+      end
+
+      properties( 'base.java.version': java_version,
+                  'base.javac.version': java_version )
+    end
+  end
+
   profile 'tzdata' do
 
     activation do

diff --git a/core/pom.xml b/core/pom.xml
@@ -534,9 +534,7 @@ DO NOT MODIFIY - GENERATED CODE
           <showWarnings>true</showWarnings>
           <showDeprecation>true</showDeprecation>
           <source>${base.java.version}</source>
-          <source>1.7</source>
           <target>${base.javac.version}</target>
-          <target>1.7</target>
           <useIncrementalCompilation>false</useIncrementalCompilation>
         </configuration>
       </plugin>
@@ -1094,6 +1092,32 @@ DO NOT MODIFIY - GENERATED CODE
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>52.0</id>
+      <activation>
+        <property>
+          <name>java.class.version</name>
+          <value>52.0</value>
+        </property>
+      </activation>
+      <properties>
+        <base.javac.version>1.8</base.javac.version>
+        <base.java.version>1.8</base.java.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>53.0</id>
+      <activation>
+        <property>
+          <name>java.class.version</name>
+          <value>53.0</value>
+        </property>
+      </activation>
+      <properties>
+        <base.javac.version>1.9</base.javac.version>
+        <base.java.version>1.9</base.java.version>
+      </properties>
+    </profile>
     <profile>
       <id>tzdata</id>
       <activation>

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -62,10 +62,12 @@ def initialize( name, version, default_spec = true )
   # just depends on jruby-core so we are sure the jruby.jar is in place
   jar "org.jruby:jruby-core:#{version}", :scope => 'test'
 
-  extension 'org.torquebox.mojo:mavengem-wagon:0.2.0'
+  extension 'org.torquebox.mojo:mavengem-wagon:0.2.2'
 
   repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'
 
+  snapshot_repository :id => :takari, :url => 'https://otto.takari.io/content/repositories/snapshots'
+
   # for testing out jruby-ossl before final release :
   #repository( :url => 'https://oss.sonatype.org/content/repositories/snapshots',
   #            :id => 'gem-snaphots' )

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -206,13 +206,23 @@ DO NOT MODIFIY - GENERATED CODE
       <id>mavengems</id>
       <url>mavengem:https://rubygems.org</url>
     </repository>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>takari</id>
+      <url>https://otto.takari.io/content/repositories/snapshots</url>
+    </repository>
   </repositories>
   <build>
     <extensions>
       <extension>
         <groupId>org.torquebox.mojo</groupId>
         <artifactId>mavengem-wagon</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.2</version>
       </extension>
     </extensions>
     <resources>
@@ -312,7 +322,7 @@ DO NOT MODIFIY - GENERATED CODE
       <plugin>
         <groupId>io.takari.polyglot</groupId>
         <artifactId>polyglot-maven-plugin</artifactId>
-        <version>0.1.15</version>
+        <version>0.1.20-SNAPSHOT</version>
         <executions>
           <execution>
             <id>install_gems</id>
@@ -363,7 +373,7 @@ DO NOT MODIFIY - GENERATED CODE
           <dependency>
             <groupId>io.takari.polyglot</groupId>
             <artifactId>polyglot-ruby</artifactId>
-            <version>0.1.15</version>
+            <version>0.1.20-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/pom.rb b/pom.rb
@@ -118,7 +118,7 @@
     plugin :clean, '2.5'
     plugin :dependency, '2.8'
     plugin :release, '2.4.1'
-    plugin :jar, '2.6'
+    plugin :jar, '3.0.2'
 
     rules = { :requireMavenVersion => { :version => '[3.3.0,)' } }
     unless model.version =~ /-SNAPSHOT/

diff --git a/pom.xml b/pom.xml
@@ -257,7 +257,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>