Merge pull request #60 from GoogleCloudPlatform/main

Include JDK21 and above in the plugin configuration range.
GoogleCloudPlatform · Oct 9, 2023 · 5ee7a6a · 5ee7a6a
2 parents 2cf0d33 + 4209be6
commit 5ee7a6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml
@@ -73,7 +73,7 @@
         <profile>
             <id>surefire-newerjava</id>
             <activation>
-                <jdk>[11,20)</jdk>
+                <jdk>[11,)</jdk>
             </activation>
             <build>
                 <plugins>
@@ -85,7 +85,10 @@
                                 -Duser.timezone=CST
                                 --add-opens java.base/java.lang=ALL-UNNAMED
                             </argLine>
-                        </configuration>
+                          <systemPropertyVariables>
+                            <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
+                        </systemPropertyVariables>
+                    </configuration>
                     </plugin>
                 </plugins>
             </build>

diff --git a/pom.xml b/pom.xml
@@ -236,8 +236,9 @@
                           <systemPropertyVariables>
                               <appengine.runtime.dir>../deployment/target/runtime-deployment-${project.version}</appengine.runtime.dir>
                               <com.google.apphosting.runtime.jetty94.LEGACY_MODE>true</com.google.apphosting.runtime.jetty94.LEGACY_MODE>
+                              <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
                           </systemPropertyVariables>
-                          <argLine>
+                        <argLine>
                               --add-opens java.base/java.lang=ALL-UNNAMED
                               --add-opens java.base/java.nio.charset=ALL-UNNAMED
                               --add-opens java.base/java.util.concurrent=ALL-UNNAMED