Skip to content

Commit 686a6de

Browse files
kazuki43zookazuki43zoo
authored
Merge pull request #1209 from kazuki43zoo/gh-1207_drop-jdk6_7
Drop support JDK 6 and 7 at build definitions
2 parents 5623828 + b1f9387 commit 686a6de

File tree

4 files changed

+36
-112
lines changed

4 files changed

+36
-112
lines changed

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.2.5/apache-maven-3.2.5-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
22
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar

‎.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
language: java
22
sudo: false
33

4-
addons:
5-
apt:
6-
packages:
7-
- openjdk-6-jdk
8-
94
jdk:
105
- oraclejdk9
116
- oraclejdk8
127
- openjdk8
13-
- openjdk7
14-
- openjdk6
158

169
before_install:
1710
- echo "MAVEN_OPTS='-Dlicense.skip=true'" > ~/.mavenrc

‎pom.xml

Lines changed: 33 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.mybatis</groupId>
2424
<artifactId>mybatis-parent</artifactId>
25-
<version>29</version>
25+
<version>31-SNAPSHOT</version>
2626
<relativePath />
2727
</parent>
2828

@@ -131,6 +131,8 @@
131131
</distributionManagement>
132132

133133
<properties>
134+
<maven.compiler.source>1.8</maven.compiler.source>
135+
<maven.compiler.target>1.8</maven.compiler.target>
134136
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
135137
<maven.compiler.testSource>1.8</maven.compiler.testSource>
136138
<maven.compiler.testCompilerArgument>-parameters</maven.compiler.testCompilerArgument>
@@ -140,13 +142,17 @@
140142
<osgi.import>*;resolution:=optional</osgi.import>
141143
<osgi.dynamicImport>*</osgi.dynamicImport>
142144
<maven.surefire.excludeGroups>org.apache.ibatis.test.SlowTests</maven.surefire.excludeGroups>
145+
146+
<!-- Override: Animal Sniffer Signature -->
147+
<signature.artifact>java18</signature.artifact>
148+
<signature.version>1.0</signature.version>
143149
</properties>
144150

145151
<dependencies>
146152
<dependency>
147153
<groupId>ognl</groupId>
148154
<artifactId>ognl</artifactId>
149-
<version>3.1.16</version>
155+
<version>3.1.16</version> <!-- Keep to use 3.1.x because 3.2.2+ occurred a RuntimeException on OgnlContext -->
150156
<scope>compile</scope>
151157
<optional>true</optional>
152158
</dependency>
@@ -175,11 +181,10 @@
175181
<version>1.2.17</version>
176182
<optional>true</optional>
177183
</dependency>
178-
<!-- Don't upgrade to 2.4+ until mybatis switches to java 7 -->
179184
<dependency>
180185
<groupId>org.apache.logging.log4j</groupId>
181186
<artifactId>log4j-core</artifactId>
182-
<version>2.3</version>
187+
<version>2.5</version> <!-- 2.6+ occurred a compile error on Log4j2AbstractLoggerImpl (This compile error will resolve on other issue) -->
183188
<optional>true</optional>
184189
</dependency>
185190
<dependency>
@@ -191,46 +196,45 @@
191196
<dependency>
192197
<groupId>cglib</groupId>
193198
<artifactId>cglib</artifactId>
194-
<version>3.2.5</version>
199+
<version>3.2.6</version>
195200
<optional>true</optional>
196201
</dependency>
197202

198203
<!-- Test dependencies -->
199204
<dependency>
200205
<groupId>org.junit.vintage</groupId>
201206
<artifactId>junit-vintage-engine</artifactId>
202-
<version>4.12.2</version>
207+
<version>5.1.0</version>
203208
<scope>test</scope>
204209
</dependency>
205210
<dependency>
206211
<groupId>org.hsqldb</groupId>
207212
<artifactId>hsqldb</artifactId>
208-
<version>2.3.5</version> <!-- Version 2.4.0 required jdk8 -->
213+
<version>2.4.0</version>
209214
<scope>test</scope>
210215
</dependency>
211216
<dependency>
212217
<groupId>org.apache.derby</groupId>
213218
<artifactId>derby</artifactId>
214-
<version>10.12.1.1</version>
219+
<version>10.14.1.0</version>
215220
<scope>test</scope>
216221
</dependency>
217222
<dependency>
218223
<groupId>org.mockito</groupId>
219224
<artifactId>mockito-core</artifactId>
220-
<version>2.12.0</version>
225+
<version>2.16.0</version>
221226
<scope>test</scope>
222227
</dependency>
223-
<!-- Do not go to 2.x until we are on jdk7 -->
224228
<dependency>
225-
<groupId>commons-dbcp</groupId>
226-
<artifactId>commons-dbcp</artifactId>
227-
<version>1.4</version>
229+
<groupId>org.apache.commons</groupId>
230+
<artifactId>commons-dbcp2</artifactId>
231+
<version>2.2.0</version>
228232
<scope>test</scope>
229233
</dependency>
230234
<dependency>
231-
<groupId>org.jboss.spec.javax.transaction</groupId>
232-
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
233-
<version>1.0.1.Final</version>
235+
<groupId>javax.transaction</groupId>
236+
<artifactId>javax.transaction-api</artifactId>
237+
<version>1.3</version>
234238
<scope>test</scope>
235239
</dependency>
236240
<dependency>
@@ -243,25 +247,25 @@
243247
<dependency>
244248
<groupId>org.postgresql</groupId>
245249
<artifactId>postgresql</artifactId>
246-
<version>42.1.4.jre6</version>
250+
<version>42.2.1</version>
247251
<scope>test</scope>
248252
</dependency>
249253
<dependency>
250254
<groupId>org.assertj</groupId>
251255
<artifactId>assertj-core</artifactId>
252-
<version>1.7.1</version> <!-- Stay on 1.7.1 to support Java 6 -->
256+
<version>3.9.1</version>
253257
<scope>test</scope>
254258
</dependency>
255259
<dependency>
256260
<groupId>eu.codearte.catch-exception</groupId>
257261
<artifactId>catch-exception</artifactId>
258-
<version>1.4.4</version>
262+
<version>1.4.6</version>
259263
<scope>test</scope>
260264
</dependency>
261265
<dependency>
262266
<groupId>ru.yandex.qatools.embed</groupId>
263267
<artifactId>postgresql-embedded</artifactId>
264-
<version>2.5</version>
268+
<version>2.8</version>
265269
<scope>test</scope>
266270
</dependency>
267271
</dependencies>
@@ -346,12 +350,6 @@
346350
</excludes>
347351
</configuration>
348352
</plugin>
349-
<!-- Patch until mybatis-parent 30 (jdk9 build support) -->
350-
<plugin>
351-
<groupId>org.codehaus.mojo</groupId>
352-
<artifactId>animal-sniffer-maven-plugin</artifactId>
353-
<version>1.16</version>
354-
</plugin>
355353
</plugins>
356354

357355
<resources>
@@ -380,71 +378,13 @@
380378
</testResources>
381379
</build>
382380

383-
<profiles>
384-
<profile>
385-
<id>java16</id>
386-
<activation>
387-
<jdk>1.6</jdk>
388-
</activation>
389-
<properties>
390-
<maven.compiler.testTarget>1.6</maven.compiler.testTarget>
391-
<maven.compiler.testSource>1.6</maven.compiler.testSource>
392-
<maven.compiler.testCompilerArgument />
393-
</properties>
394-
<build>
395-
<pluginManagement>
396-
<plugins>
397-
<plugin>
398-
<groupId>org.apache.maven.plugins</groupId>
399-
<artifactId>maven-compiler-plugin</artifactId>
400-
<configuration>
401-
<testExcludes>
402-
<testExclude>**/usesjava7/**/*.java</testExclude>
403-
<testExclude>**/usesjava8/**/*.java</testExclude>
404-
</testExcludes>
405-
</configuration>
406-
</plugin>
407-
<plugin>
408-
<groupId>org.apache.felix</groupId>
409-
<artifactId>maven-bundle-plugin</artifactId>
410-
<version>2.5.4</version> <!-- For java 6, remain at older version -->
411-
</plugin>
412-
</plugins>
413-
</pluginManagement>
414-
<plugins>
415-
<plugin>
416-
<groupId>org.apache.felix</groupId>
417-
<artifactId>maven-bundle-plugin</artifactId>
418-
<version>2.5.4</version> <!-- For java 6, remain at older version -->
419-
</plugin>
420-
</plugins>
421-
</build>
422-
</profile>
423-
<profile>
424-
<id>java17</id>
425-
<activation>
426-
<jdk>1.7</jdk>
427-
</activation>
428-
<properties>
429-
<maven.compiler.testTarget>1.7</maven.compiler.testTarget>
430-
<maven.compiler.testSource>1.7</maven.compiler.testSource>
431-
<maven.compiler.testCompilerArgument />
432-
</properties>
433-
<build>
434-
<pluginManagement>
435-
<plugins>
436-
<plugin>
437-
<groupId>org.apache.maven.plugins</groupId>
438-
<artifactId>maven-compiler-plugin</artifactId>
439-
<configuration>
440-
<testExcludes>
441-
<testExclude>**/usesjava8/**/*.java</testExclude>
442-
</testExcludes>
443-
</configuration>
444-
</plugin>
445-
</plugins>
446-
</pluginManagement>
447-
</build>
448-
</profile>
449-
</profiles>
381+
<repositories>
382+
<!-- Adding for mybatis-parent 31-SNAPSHOT -->
383+
<repository>
384+
<id>sonatype-oss-snapshots</id>
385+
<name>Sonatype OSS Snapshots Repository</name>
386+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
387+
</repository>
388+
</repositories>
389+
450390
</project>

‎travis/install.sh

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright 2009-2017 the original author or authors.
3+
# Copyright 2009-2018 the original author or authors.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -15,13 +15,4 @@
1515
# limitations under the License.
1616
#
1717

18-
if [ $TRAVIS_JDK_VERSION == "openjdk6" ]; then
19-
# Java 1.6
20-
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pjava16 --settings ./travis/settings.xml
21-
elif [ $TRAVIS_JDK_VERSION == "openjdk7" ]; then
22-
# Java 1.7
23-
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pjava17 --settings ./travis/settings.xml
24-
else
25-
# Java 1.8 and 9
26-
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V --settings ./travis/settings.xml
27-
fi
18+
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V --settings ./travis/settings.xml

0 commit comments

Comments
 (0)