Skip to content

Drop support JDK 6 and 7 at build definitions #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kazuki43zoo merged 10 commits into from
Mar 19, 2018
Merged

Drop support JDK 6 and 7 at build definitions #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
45cf64c
Drop JDK6 on travis build #1207
kazuki43zoo Mar 16, 2018
a84f67c
Drop maven profile for JDK6 #1207
kazuki43zoo Mar 16, 2018
e3c73bc
Refine build definition for droping JDK6 #1207
kazuki43zoo Mar 16, 2018
4cf9c5a
Drop JDK7 on travis build #1207
kazuki43zoo Mar 16, 2018
59229e3
Drop maven profile for JDK7 #1207
kazuki43zoo Mar 16, 2018
490ac00
Refine build definition for droping JDK7 #1207
kazuki43zoo Mar 16, 2018
bc7ed62
Upgrade dependency artifacts to latest version #1207
kazuki43zoo Mar 16, 2018
adcbfbd
Update to maven 3.5.2 #1207
kazuki43zoo Mar 19, 2018
f471b32
Change artifact to javax.transaction:javax.transaction-api #1207
kazuki43zoo Mar 19, 2018
b1f9387
Upgrade to mybatis-parent to 31-SNAPSHOT #1207
kazuki43zoo Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.2.5/apache-maven-3.2.5-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar
7 changes: 0 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
language: java
sudo: false

addons:
apt:
packages:
- openjdk-6-jdk

jdk:
- oraclejdk9
- oraclejdk8
- openjdk8
- openjdk7
- openjdk6

before_install:
- echo "MAVEN_OPTS='-Dlicense.skip=true'" > ~/.mavenrc
Expand Down
126 changes: 33 additions & 93 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-parent</artifactId>
<version>29</version>
<version>31-SNAPSHOT</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -131,6 +131,8 @@
</distributionManagement>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<maven.compiler.testCompilerArgument>-parameters</maven.compiler.testCompilerArgument>
Expand All @@ -140,13 +142,17 @@
<osgi.import>*;resolution:=optional</osgi.import>
<osgi.dynamicImport>*</osgi.dynamicImport>
<maven.surefire.excludeGroups>org.apache.ibatis.test.SlowTests</maven.surefire.excludeGroups>

<!-- Override: Animal Sniffer Signature -->
<signature.artifact>java18</signature.artifact>
<signature.version>1.0</signature.version>
</properties>

<dependencies>
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
<version>3.1.16</version>
<version>3.1.16</version> <!-- Keep to use 3.1.x because 3.2.2+ occurred a RuntimeException on OgnlContext -->
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -175,11 +181,10 @@
<version>1.2.17</version>
<optional>true</optional>
</dependency>
<!-- Don't upgrade to 2.4+ until mybatis switches to java 7 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.3</version>
<version>2.5</version> <!-- 2.6+ occurred a compile error on Log4j2AbstractLoggerImpl (This compile error will resolve on other issue) -->
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -191,46 +196,45 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>3.2.5</version>
<version>3.2.6</version>
<optional>true</optional>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>4.12.2</version>
<version>5.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.5</version> <!-- Version 2.4.0 required jdk8 -->
<version>2.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.12.1.1</version>
<version>10.14.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.12.0</version>
<version>2.16.0</version>
<scope>test</scope>
</dependency>
<!-- Do not go to 2.x until we are on jdk7 -->
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
<version>1.0.1.Final</version>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -243,25 +247,25 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.1.4.jre6</version>
<version>42.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>1.7.1</version> <!-- Stay on 1.7.1 to support Java 6 -->
<version>3.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>eu.codearte.catch-exception</groupId>
<artifactId>catch-exception</artifactId>
<version>1.4.4</version>
<version>1.4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ru.yandex.qatools.embed</groupId>
<artifactId>postgresql-embedded</artifactId>
<version>2.5</version>
<version>2.8</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -346,12 +350,6 @@
</excludes>
</configuration>
</plugin>
<!-- Patch until mybatis-parent 30 (jdk9 build support) -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.16</version>
</plugin>
</plugins>

<resources>
Expand Down Expand Up @@ -380,71 +378,13 @@
</testResources>
</build>

<profiles>
<profile>
<id>java16</id>
<activation>
<jdk>1.6</jdk>
</activation>
<properties>
<maven.compiler.testTarget>1.6</maven.compiler.testTarget>
<maven.compiler.testSource>1.6</maven.compiler.testSource>
<maven.compiler.testCompilerArgument />
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
<testExclude>**/usesjava7/**/*.java</testExclude>
<testExclude>**/usesjava8/**/*.java</testExclude>
</testExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.4</version> <!-- For java 6, remain at older version -->
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.4</version> <!-- For java 6, remain at older version -->
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>java17</id>
<activation>
<jdk>1.7</jdk>
</activation>
<properties>
<maven.compiler.testTarget>1.7</maven.compiler.testTarget>
<maven.compiler.testSource>1.7</maven.compiler.testSource>
<maven.compiler.testCompilerArgument />
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
<testExclude>**/usesjava8/**/*.java</testExclude>
</testExcludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
<repositories>
Copy link
Member

@hazendaz hazendaz Mar 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This used to work without problems. Anyone know what changed to require this? Do we want to add this to the parent?

Copy link
Member Author

@kazuki43zoo kazuki43zoo Mar 24, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added to refer the mybatis-parent 31-SNAPSHOT on travis-ci. (it is temporary solution until releasing mybatis-parent 31).

Do we want to add this to the parent?

No.

Copy link
Member

@hazendaz hazendaz Mar 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I find it odd though that using the snapshots used to work fine on travis. I suspect something changed. I did fully bring the parent up-to-date just a little while ago. I've got some questions in it that I need to answer but likely could get it released out soon.

<!-- Adding for mybatis-parent 31-SNAPSHOT -->
<repository>
<id>sonatype-oss-snapshots</id>
<name>Sonatype OSS Snapshots Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

</project>
13 changes: 2 additions & 11 deletions travis/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright 2009-2017 the original author or authors.
# Copyright 2009-2018 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -15,13 +15,4 @@
# limitations under the License.
#

if [ $TRAVIS_JDK_VERSION == "openjdk6" ]; then
# Java 1.6
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pjava16 --settings ./travis/settings.xml
elif [ $TRAVIS_JDK_VERSION == "openjdk7" ]; then
# Java 1.7
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pjava17 --settings ./travis/settings.xml
else
# Java 1.8 and 9
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V --settings ./travis/settings.xml
fi
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V --settings ./travis/settings.xml