From c78d0f3a82f9be6ee7a55b5ecc5ddbbd4a904dcd Mon Sep 17 00:00:00 2001
From: "Ahmad K. Bawaneh" <ahmad.bawaneh@dominokit.com>
Date: Sun, 27 Oct 2024 11:55:52 +0300
Subject: [PATCH 1/4] set java 11 as minimum for sample apps templates

---
 .../com/google/gwt/user/tools/templates/ant/build.xmlsrc    | 4 ++--
 .../com/google/gwt/user/tools/templates/maven/pom.xmlsrc    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc b/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
index a0a76ed047e..a4660620be4 100644
--- a/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
@@ -27,7 +27,7 @@
     <mkdir dir="@warFolder/WEB-INF/classes"/>
     <javac srcdir="@srcFolder" includes="**" encoding="utf-8"
         destdir="@warFolder/WEB-INF/classes"
-        source="1.7" target="1.7" nowarn="true"
+        source="11" target="11" nowarn="true"
         debug="true" debuglevel="lines,vars,source">
       <classpath refid="project.class.path"/>
     </javac>
@@ -70,7 +70,7 @@
 @testTargetsBegin
   <target name="javac.tests" depends="javac" description="Compiles test code">
     <javac srcdir="@testFolder" includes="**" encoding="utf-8"
-      source="1.7" target="1.7" nowarn="true"
+      source="11" target="11" nowarn="true"
       destdir="@warFolder/WEB-INF/classes"
       debug="true" debuglevel="lines,vars,source">
       <classpath location="@junitJar"/>
diff --git a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
index b5d58e1c0d3..ef324fa2e5c 100644
--- a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
@@ -15,8 +15,8 @@
     <!-- Setting maven.compiler.source to something different to 1.8
          needs that you configure the sourceLevel in gwt-maven-plugin since
          GWT compiler 2.8 and above requires 1.8 (see gwt-maven-plugin block below) -->
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
 
     <!-- Don't let your Mac use a crazy non-standard encoding -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -85,7 +85,7 @@
           <failOnError>true</failOnError>
           <!-- GWT compiler 2.8 and above requires 1.8, hence define sourceLevel here if you use
                a different source language for java compilation -->
-          <sourceLevel>1.8</sourceLevel>
+          <sourceLevel>11</sourceLevel>
           <!-- Compiler configuration -->
           <compilerArgs>
             <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->

From e4060d1d64090ac51cdac2dd2846ecebc914f04f Mon Sep 17 00:00:00 2001
From: "Ahmad K. Bawaneh" <ahmad.bawaneh@dominokit.com>
Date: Sun, 27 Oct 2024 18:28:55 +0300
Subject: [PATCH 2/4] use release tag instead and update comments

---
 .../com/google/gwt/user/tools/templates/maven/pom.xmlsrc  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
index ef324fa2e5c..398d15dee5d 100644
--- a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
@@ -12,9 +12,9 @@
 
   <properties>
 
-    <!-- Setting maven.compiler.source to something different to 1.8
+    <!-- Setting maven.compiler.source to something different to 11
          needs that you configure the sourceLevel in gwt-maven-plugin since
-         GWT compiler 2.8 and above requires 1.8 (see gwt-maven-plugin block below) -->
+         GWT compiler 2.12.0 and above requires 11 (see gwt-maven-plugin block below) -->
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
 
@@ -83,9 +83,9 @@
           <moduleName>@moduleName</moduleName>
           <moduleShortName>@moduleShortName</moduleShortName>
           <failOnError>true</failOnError>
-          <!-- GWT compiler 2.8 and above requires 1.8, hence define sourceLevel here if you use
+          <!-- GWT compiler 2.12.0 and above requires 11, hence define sourceLevel here if you use
                a different source language for java compilation -->
-          <sourceLevel>11</sourceLevel>
+          <release>11</release>
           <!-- Compiler configuration -->
           <compilerArgs>
             <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->

From dfa904235e13f5ffc88602fc29b1b0910471881a Mon Sep 17 00:00:00 2001
From: "Ahmad K. Bawaneh" <ahmad.bawaneh@dominokit.com>
Date: Wed, 30 Oct 2024 17:54:44 +0300
Subject: [PATCH 3/4] revert release tag in gwt plugin

---
 user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
index 398d15dee5d..1910bb0670c 100644
--- a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
@@ -85,7 +85,7 @@
           <failOnError>true</failOnError>
           <!-- GWT compiler 2.12.0 and above requires 11, hence define sourceLevel here if you use
                a different source language for java compilation -->
-          <release>11</release>
+          <sourceLevel>11</sourceLevel>
           <!-- Compiler configuration -->
           <compilerArgs>
             <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->

From 0866c889cd8ad217ced71666ba7ef8b31124a9e3 Mon Sep 17 00:00:00 2001
From: "Ahmad K. Bawaneh" <ahmad.bawaneh@dominokit.com>
Date: Wed, 30 Oct 2024 17:58:42 +0300
Subject: [PATCH 4/4] replace the source and target properties with release
 property

---
 user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
index 1910bb0670c..c312f15d840 100644
--- a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
@@ -15,8 +15,7 @@
     <!-- Setting maven.compiler.source to something different to 11
          needs that you configure the sourceLevel in gwt-maven-plugin since
          GWT compiler 2.12.0 and above requires 11 (see gwt-maven-plugin block below) -->
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.release>11</maven.compiler.release>
 
     <!-- Don't let your Mac use a crazy non-standard encoding -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>