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-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 79d2f5583c9e
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: adc2f755dbd4
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 28, 2017

  1. drop support for Java 1.6 and compile using Java 7

    @kares
    kares committed Jul 28, 2017
    Copy the full SHA
    610f142 View commit details

  2. [travis-ci] adjust testing matrix - since were dropping old JRuby/Java

    @kares
    kares committed Jul 28, 2017
    Copy the full SHA
    adc2f75 View commit details
Showing with 10 additions and 25 deletions.
  1. +5 −20 .travis.yml
  2. +2 −2 Mavenfile
  3. +3 −3 pom.xml
25 changes: 5 additions & 20 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -4,10 +4,7 @@ jdk:
- oraclejdk7
- oraclejdk8
env:
- TEST_PROFILE=test-1.6.8
- TEST_PROFILE=test-1.7.4
- TEST_PROFILE=test-1.7.13
- TEST_PROFILE=test-1.7.18
- TEST_PROFILE=test-1.7.20
- TEST_PROFILE=test-1.7.26
- TEST_PROFILE=test-9.0.5.0
- TEST_PROFILE=test-9.1.8.0
@@ -23,7 +20,7 @@ matrix:
- env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.24
- env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.18
rvm: jruby-1.7.20
include:
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
@@ -35,24 +32,12 @@ matrix:
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-1.7.26
#
- jdk: openjdk6
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.6.8" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
- jdk: openjdk6
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.4" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
- jdk: openjdk6
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.13" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
- jdk: openjdk6
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.18" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
- jdk: openjdk6
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.24" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
- jdk: openjdk6
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.26" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
rvm: jruby-1.7.26
#
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
4 changes: 2 additions & 2 deletions Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ distribution_management do
repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
end

java_target = '1.6'
java_target = '1.7'
gen_sources = '${basedir}/target/generated-sources' # hard-coded in AnnotationBinder

plugin( 'org.codehaus.mojo:exec-maven-plugin', '1.3.2' ) do
@@ -49,7 +49,7 @@ plugin( 'org.codehaus.mojo:build-helper-maven-plugin', '1.9' ) do
end

plugin( :compiler, '3.1',
:source => '1.6', :target => java_target,
:source => '1.7', :target => java_target,
:encoding => 'UTF-8', :debug => true,
:showWarnings => true, :showDeprecation => true,

6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -232,7 +232,7 @@ DO NOT MODIFIY - GENERATED CODE
<executable>java</executable>
<classpathScope>compile</classpathScope>
<arguments>
<argument>-Djruby.bytecode.version=1.6</argument>
<argument>-Djruby.bytecode.version=1.7</argument>
<argument>-classpath</argument>
<classpath />
<argument>org.jruby.anno.InvokerGenerator</argument>
@@ -283,8 +283,8 @@ DO NOT MODIFIY - GENERATED CODE
</execution>
</executions>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
<encoding>UTF-8</encoding>
<debug>true</debug>
<showWarnings>true</showWarnings>