Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2aa5e4468b8f^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c64e360d2eed
Choose a head ref
  • 3 commits
  • 7 files changed
  • 1 contributor

Commits on Apr 11, 2017

  1. Copy the full SHA
    2aa5e44 View commit details
  2. Copy the full SHA
    19b0350 View commit details
  3. pick the right javac version depending on the jdk which runs maven

    jdk8 uses 1.8 as specification version and jdk9 is using 9. there could be
    other ways to solve this - just picked one.
    mkristian committed Apr 11, 2017
    Copy the full SHA
    c64e360 View commit details
Showing with 60 additions and 11 deletions.
  1. +1 −1 .mvn/extensions.xml
  2. +15 −2 core/pom.rb
  3. +26 −2 core/pom.xml
  4. +3 −1 lib/pom.rb
  5. +13 −3 lib/pom.xml
  6. +1 −1 pom.rb
  7. +1 −1 pom.xml
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -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>
17 changes: 15 additions & 2 deletions core/pom.rb
Original file line number Diff line number Diff line change
@@ -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
28 changes: 26 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 3 additions & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
@@ -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' )
16 changes: 13 additions & 3 deletions lib/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion pom.rb
Original file line number Diff line number Diff line change
@@ -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/
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -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>