From 78dcc1862ec3a425eb7f25beaad26428b68fb810 Mon Sep 17 00:00:00 2001
From: Vojtech Juranek <vjuranek@redhat.com>
Date: Fri, 8 Apr 2022 13:50:48 +0200
Subject: [PATCH] DBZ-4949 Use Java 11 as a baseline

* use Java 11 as a baseline for Debezium
* use Java 17 as a baseline for tests
* remove redundant maven setup and JDK11 profile
---
 debezium-connect-rest-extension/pom.xml      |  1 -
 debezium-schema-generator/pom.xml            |  4 ----
 debezium-server/debezium-server-http/pom.xml |  8 --------
 pom.xml                                      | 17 ++---------------
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/debezium-connect-rest-extension/pom.xml b/debezium-connect-rest-extension/pom.xml
index 3d1365cff..f777ae786 100644
--- a/debezium-connect-rest-extension/pom.xml
+++ b/debezium-connect-rest-extension/pom.xml
@@ -15,7 +15,6 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <maven.compiler.release>11</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/debezium-schema-generator/pom.xml b/debezium-schema-generator/pom.xml
index 3385261e5..5c6603f44 100644
--- a/debezium-schema-generator/pom.xml
+++ b/debezium-schema-generator/pom.xml
@@ -13,10 +13,6 @@
   <name>Debezium Schema Generator</name>
   <packaging>maven-plugin</packaging>
 
-  <properties>
-    <maven.compiler.release>11</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>io.debezium</groupId>
diff --git a/debezium-server/debezium-server-http/pom.xml b/debezium-server/debezium-server-http/pom.xml
index 106aa650c..1ec36f783 100644
--- a/debezium-server/debezium-server-http/pom.xml
+++ b/debezium-server/debezium-server-http/pom.xml
@@ -129,20 +129,12 @@
                     </systemProperties>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <release>11</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <show>private</show>
                     <nohelp>true</nohelp>
-                    <release>11</release>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/pom.xml b/pom.xml
index 959d0ffae..6a613b42f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,11 +55,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <!-- Can't use the (generally preferable) release option yet, as the
-             Cassandra connector still needs to be built with Java 1.8 which
-             isn't aware of this option -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.testRelease>17</maven.compiler.testRelease>
 
         <!-- Enforce JDK 11 for building (handled via JBoss parent POM)-->
         <jdk.min.version>11</jdk.min.version>
@@ -436,16 +433,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>jdk11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <properties>
-                <modules.argline>--illegal-access=permit</modules.argline>
-                <maven.compiler.release>8</maven.compiler.release>
-            </properties>
-        </profile>
         <profile>
             <id>oracle</id>
             <modules>