Further adjustments to remove traces of Java 7.

google · Sep 18, 2024 · f3a27cd · f3a27cd
1 parent c45fa90
commit f3a27cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,8 @@ Maven:
 
 ### Requirements
 #### Minimum Java version
-- Gson 2.9.0 and newer: Java 7
+- Gson 2.12.0 and newer: Java 8
+- Gson 2.9.0 to 2.11.0: Java 7
 - Gson 2.8.9 and older: Java 6
 
 Despite supporting older Java versions, Gson also provides a JPMS module descriptor (module name `com.google.gson`) for users of Java 9 or newer.

diff --git a/gson/src/test/java/com/google/gson/internal/JavaVersionTest.java b/gson/src/test/java/com/google/gson/internal/JavaVersionTest.java
@@ -30,8 +30,8 @@ public class JavaVersionTest {
 
   @Test
   public void testGetMajorJavaVersion() {
-    // Gson currently requires at least Java 7
-    assertThat(JavaVersion.getMajorJavaVersion()).isAtLeast(7);
+    // Gson currently requires at least Java 8
+    assertThat(JavaVersion.getMajorJavaVersion()).isAtLeast(8);
   }
 
   @Test

diff --git a/pom.xml b/pom.xml
@@ -556,20 +556,6 @@
       </build>
     </profile>
 
-    <!-- Slightly adjust build to support building with JDK >= 21
-      However, by default this will intentionally be blocked by the Maven Enforcer Plugin defined above
-      and must be explicitly circumvented to avoid building non-release Gson artifacts by accident -->
-    <profile>
-      <id>jdk21+</id>
-      <activation>
-        <jdk>[21,)</jdk>
-      </activation>
-      <properties>
-        <!-- JDK 21 does not support Java 7 as release, must use at least Java 8 -->
-        <maven.compiler.release>8</maven.compiler.release>
-      </properties>
-    </profile>
-
     <!-- Profile defining additional plugins to be executed for release -->
     <profile>
       <id>release</id>