From 01a583ff65fd70b7f0e966a3c01eb08a9c9c3ef1 Mon Sep 17 00:00:00 2001
From: Martin Grotzke <martin.grotzke@googlemail.com>
Date: Tue, 5 Feb 2019 22:22:26 +0100
Subject: [PATCH] Push source/target version to 1.8, update objenesis

objenesis 3.0.1 comes with an Automatic Module Name, i.e. with that
kryo does no longer depend on any library that's not explicitely named.
For details / the motivation see also [this post](https://blog.joda.org/2017/05/java-se-9-jpms-automatic-modules.html).

Because objenesis 3.0.1 only supports java 8, the source/target version
is pushes accordingly.
---
 .travis.yml                                   |  7 +---
 pom-main.xml                                  |  2 +-
 pom.xml                                       | 42 +------------------
 ...erTest.java => ClosureSerializerTest.java} |  5 +--
 ...Test.java => OptionalSerializersTest.java} |  5 +--
 ...zersTest.java => TimeSerializersTest.java} |  5 +--
 6 files changed, 10 insertions(+), 56 deletions(-)
 rename test/com/esotericsoftware/kryo/serializers/{Java8ClosureSerializerTest.java => ClosureSerializerTest.java} (93%)
 rename test/com/esotericsoftware/kryo/serializers/{Java8OptionalSerializersTest.java => OptionalSerializersTest.java} (93%)
 rename test/com/esotericsoftware/kryo/serializers/{Java8TimeSerializersTest.java => TimeSerializersTest.java} (96%)

diff --git a/.travis.yml b/.travis.yml
index 72d85549a..200ae6692 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,12 +23,9 @@ install:
   - mvn -B -V clean test
 
 script:
-  # compile tests with java 8, but with testSource/testTarget 1.7 (disabled java8 profile), so that we can run tests with java 7
+  # compile tests with java 8
   - jdk_switcher use oraclejdk8
-  - mvn -B -P!java8 clean install
-  # test java 7
-  - jdk_switcher use openjdk7
-  - mvn -v && mvn -B test
+  - mvn -B clean install
   # test java 9 (only available via oraclejdk9)
   - jdk_switcher use oraclejdk9
   - mvn -v && mvn -B test
diff --git a/pom-main.xml b/pom-main.xml
index 533f10923..08b2af0cb 100644
--- a/pom-main.xml
+++ b/pom-main.xml
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>org.objenesis</groupId>
 			<artifactId>objenesis</artifactId>
-			<version>2.6</version>
+			<version>3.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.esotericsoftware</groupId>
diff --git a/pom.xml b/pom.xml
index 3c1b9c505..2b337f651 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,8 @@
 	</developers>
 
 	<properties>
-		<javac.target>1.7</javac.target>
+		<javac.target>1.8</javac.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<test.exclude>**/Java8*Test.java</test.exclude>
 	</properties>
 
 	<modules>
@@ -79,9 +78,6 @@
 						<source>${javac.target}</source>
 						<target>${javac.target}</target>
 						<encoding>utf-8</encoding>
-						<testExcludes>
-							<testExclude>${test.exclude}</testExclude>
-						</testExcludes>
 					</configuration>
 				</plugin>
 
@@ -156,42 +152,6 @@
 			</build>
 		</profile>
 
-		<profile>
-			<id>until-java8</id>
-			<activation>
-				<!-- Use exclusive 1.8 range instead of inclusive 1.7, because an upper bound ",1.7]" is likely not to include most releases of 1.7,
-				   since they will have an additional "patch" release such as _05 that is not taken into consideration in the above range.
-				   See also: http://maven.apache.org/guides/introduction/introduction-to-profiles.html#Details_on_profile_activation -->
-				<jdk>[1.5,1.8)</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>2.22.0</version>
-						<configuration>
-							<excludes>
-								<exclude>**/Java8*Test.java</exclude>
-							</excludes>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<profile>
-			<id>java8</id>
-			<!-- To disable this profile run mvn with '-P !java8' (maybe escape the exclamation mark). -->
-			<activation><jdk>[1.8,)</jdk></activation>
-			<!-- Use properties to change compiler configuration because overriding build/plugin config just did not work. -->
-			<properties>
-				<!-- Setting an empty values does not override/set the property. -->
-				<test.exclude>someValueWhichDoesNotExist</test.exclude>
-				<maven.compiler.testSource>1.8</maven.compiler.testSource>
-				<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
-			</properties>
-		</profile>
 	</profiles>
 
 	<repositories>
diff --git a/test/com/esotericsoftware/kryo/serializers/Java8ClosureSerializerTest.java b/test/com/esotericsoftware/kryo/serializers/ClosureSerializerTest.java
similarity index 93%
rename from test/com/esotericsoftware/kryo/serializers/Java8ClosureSerializerTest.java
rename to test/com/esotericsoftware/kryo/serializers/ClosureSerializerTest.java
index 907b2fb91..cd7b4876e 100644
--- a/test/com/esotericsoftware/kryo/serializers/Java8ClosureSerializerTest.java
+++ b/test/com/esotericsoftware/kryo/serializers/ClosureSerializerTest.java
@@ -31,9 +31,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-/** Test for java 8 closures. For JDK < 1.8 exclude from the surefire tests via the "until-java8" profile in pom.xml (which
- * excludes "Java8*Tests"). */
-public class Java8ClosureSerializerTest extends KryoTestCase {
+/** Test for java 8 closures. */
+public class ClosureSerializerTest extends KryoTestCase {
 	@Before
 	public void setUp () throws Exception {
 		super.setUp();
diff --git a/test/com/esotericsoftware/kryo/serializers/Java8OptionalSerializersTest.java b/test/com/esotericsoftware/kryo/serializers/OptionalSerializersTest.java
similarity index 93%
rename from test/com/esotericsoftware/kryo/serializers/Java8OptionalSerializersTest.java
rename to test/com/esotericsoftware/kryo/serializers/OptionalSerializersTest.java
index 12ce38efc..71b6e4c55 100644
--- a/test/com/esotericsoftware/kryo/serializers/Java8OptionalSerializersTest.java
+++ b/test/com/esotericsoftware/kryo/serializers/OptionalSerializersTest.java
@@ -30,9 +30,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-/** Test for java 8 Optional* serializers. Excluded from surefire tests via the "until-java8" profile in pom.xml which excludes
- * "Java8*Tests". */
-public class Java8OptionalSerializersTest extends KryoTestCase {
+/** Test for java 8 Optional* serializers. */
+public class OptionalSerializersTest extends KryoTestCase {
 
 	{
 		supportsCopy = true;
diff --git a/test/com/esotericsoftware/kryo/serializers/Java8TimeSerializersTest.java b/test/com/esotericsoftware/kryo/serializers/TimeSerializersTest.java
similarity index 96%
rename from test/com/esotericsoftware/kryo/serializers/Java8TimeSerializersTest.java
rename to test/com/esotericsoftware/kryo/serializers/TimeSerializersTest.java
index c176d2670..30cdf7303 100644
--- a/test/com/esotericsoftware/kryo/serializers/Java8TimeSerializersTest.java
+++ b/test/com/esotericsoftware/kryo/serializers/TimeSerializersTest.java
@@ -40,9 +40,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-/** Test for java 8 java.time.* serializers. Excluded from surefire tests via the "until-java8" profile in pom.xml which excludes
- * "Java8*Tests". */
-public class Java8TimeSerializersTest extends KryoTestCase {
+/** Test for java 8 java.time.* serializers. */
+public class TimeSerializersTest extends KryoTestCase {
 
 	@Before
 	public void setUp () throws Exception {