[3.x] Address maven 3.9.2 plugin issues. (helidon-io#7251)

Address maven 3.9.2 plugin issues. Fixes helidon-io#6928 --------- Signed-off-by: Tomáš Kraus <[email protected]>
ljnelson · Aug 9, 2023 · 724e27e · 724e27e
1 parent f040c33
commit 724e27e
Show file tree

Hide file tree

Showing 23 changed files with 88 additions and 92 deletions.
diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
@@ -32,7 +32,7 @@
     <description>Parent pom for Helidon MP applications</description>
 
     <properties>
-        <version.plugin.jandex>1.0.6</version.plugin.jandex>
+        <version.plugin.jandex>1.2.3</version.plugin.jandex>
         <version.plugin.jaxb2>0.14.0</version.plugin.jaxb2>
         <version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
         <version.plugin.hibernate.enhance>${version.lib.hibernate}</version.plugin.hibernate.enhance>

diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml
@@ -37,18 +37,18 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <maven.compiler.release>${maven.compiler.source}</maven.compiler.release>
-        <version.plugin.compiler>3.8.1</version.plugin.compiler>
+        <version.plugin.compiler>3.11.0</version.plugin.compiler>
         <version.plugin.dependency>3.6.0</version.plugin.dependency>
-        <version.plugin.exec>1.6.0</version.plugin.exec>
-        <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
+        <version.plugin.exec>3.1.0</version.plugin.exec>
+        <version.plugin.failsafe>3.1.2</version.plugin.failsafe>
         <version.plugin.helidon>3.0.5</version.plugin.helidon>
         <version.plugin.helidon-cli>3.0.4</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.nativeimage>0.9.16</version.plugin.nativeimage>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
-        <version.plugin.protobuf>0.5.1</version.plugin.protobuf>
-        <version.plugin.resources>2.7</version.plugin.resources>
-        <version.plugin.surefire>3.0.0-M5</version.plugin.surefire>
+        <version.plugin.protobuf>0.6.1</version.plugin.protobuf>
+        <version.plugin.resources>3.3.1</version.plugin.resources>
+        <version.plugin.surefire>3.1.2</version.plugin.surefire>
     </properties>
 
     <build>

diff --git a/common/common/pom.xml b/common/common/pom.xml
@@ -29,28 +29,17 @@
     <name>Helidon Common</name>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src/main/templates</directory>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}/generated-sources/templates</targetPath>
+            </resource>
+        </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>templates</id>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/templates</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <outputDirectory>${project.build.directory}/generated-sources/templates</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>

diff --git a/config/etcd/pom.xml b/config/etcd/pom.xml
@@ -141,15 +141,15 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <property>
                             <!-- on big machines (e.g. 52 cores hyperthreaded)
                              this failed with too many open files
                              -->
                             <name>io.netty.eventLoopThreads</name>
                             <value>2</value>
                         </property>
-                    </systemProperties>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/examples/microprofile/messaging-sse/pom.xml b/examples/microprofile/messaging-sse/pom.xml
@@ -57,30 +57,19 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src/main/java/io/helidon/microprofile/example/messaging/sse</directory>
+                <includes>
+                    <include>MsgProcessingBean.java</include>
+                </includes>
+                <targetPath>${project.build.directory}/classes/WEB</targetPath>
+            </resource>
+        </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>snippet</id>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/java/io/helidon/microprofile/example/messaging/sse</directory>
-                                    <includes>
-                                        <include>MsgProcessingBean.java</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                            <outputDirectory>${project.build.directory}/classes/WEB</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
@@ -36,19 +36,19 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- plugin versions -->
-        <version.plugin.compiler>3.8.1</version.plugin.compiler>
+        <version.plugin.compiler>3.11.0</version.plugin.compiler>
         <version.plugin.dependency>3.6.0</version.plugin.dependency>
         <version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
         <version.plugin.exec>1.6.0</version.plugin.exec>
-        <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
+        <version.plugin.failsafe>3.1.2</version.plugin.failsafe>
         <version.plugin.helidon>3.0.5</version.plugin.helidon>
         <version.plugin.helidon-cli>3.0.4</version.plugin.helidon-cli>
-        <version.plugin.jandex>1.0.6</version.plugin.jandex>
+        <version.plugin.jandex>1.2.3</version.plugin.jandex>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
-        <version.plugin.protobuf>0.5.1</version.plugin.protobuf>
-        <version.plugin.resources>2.7</version.plugin.resources>
-        <version.plugin.surefire>3.0.0-M5</version.plugin.surefire>
+        <version.plugin.protobuf>0.6.1</version.plugin.protobuf>
+        <version.plugin.resources>3.3.1</version.plugin.resources>
+        <version.plugin.surefire>3.1.2</version.plugin.surefire>
     </properties>
 
     <dependencyManagement>

diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml
@@ -36,17 +36,17 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- plugin versions -->
-        <version.plugin.compiler>3.8.1</version.plugin.compiler>
+        <version.plugin.compiler>3.11.0</version.plugin.compiler>
         <version.plugin.dependency>3.6.0</version.plugin.dependency>
         <version.plugin.exec>1.6.0</version.plugin.exec>
-        <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
+        <version.plugin.failsafe>3.1.2</version.plugin.failsafe>
         <version.plugin.helidon>3.0.5</version.plugin.helidon>
         <version.plugin.helidon-cli>3.0.4</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
-        <version.plugin.protobuf>0.5.1</version.plugin.protobuf>
-        <version.plugin.resources>2.7</version.plugin.resources>
-        <version.plugin.surefire>3.0.0-M5</version.plugin.surefire>
+        <version.plugin.protobuf>0.6.1</version.plugin.protobuf>
+        <version.plugin.resources>3.3.1</version.plugin.resources>
+        <version.plugin.surefire>3.1.2</version.plugin.surefire>
     </properties>
 
     <dependencyManagement>

diff --git a/examples/todo-app/frontend/pom.xml b/examples/todo-app/frontend/pom.xml
@@ -158,7 +158,7 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.9.1</version>
+                <version>1.13.4</version>
                 <configuration>
                     <nodeVersion>${version.nodejs}</nodeVersion>
                     <npmVersion>${version.npm}</npmVersion>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -143,10 +143,10 @@
     </developers>
 
     <properties>
-        <version.plugin.clean>3.1.0</version.plugin.clean>
+        <version.plugin.clean>3.3.1</version.plugin.clean>
         <version.plugin.deploy>2.8.2</version.plugin.deploy>
         <version.plugin.gpg>1.6</version.plugin.gpg>
-        <version.plugin.install>3.0.0-M1</version.plugin.install>
+        <version.plugin.install>3.1.1</version.plugin.install>
         <version.plugin.nexus-staging>1.6.13</version.plugin.nexus-staging>
         <version.plugin.site>3.8.2</version.plugin.site>
         <version.plugin.versions>2.7</version.plugin.versions>

diff --git a/pom.xml b/pom.xml
@@ -93,38 +93,38 @@
         <!-- maven plugin versions -->
         <version.plugin.archetype-packaging>3.1.2</version.plugin.archetype-packaging>
         <version.plugin.archetype>3.1.2</version.plugin.archetype>
-        <version.plugin.build-helper>1.12</version.plugin.build-helper>
-        <version.plugin.checkstyle>3.1.2</version.plugin.checkstyle>
-        <version.plugin.compiler>3.8.1</version.plugin.compiler>
+        <version.plugin.build-helper>3.4.0</version.plugin.build-helper>
+        <version.plugin.checkstyle>3.3.0</version.plugin.checkstyle>
+        <version.plugin.compiler>3.11.0</version.plugin.compiler>
         <version.plugin.dependency>3.6.0</version.plugin.dependency>
         <version.plugin.directory>1.0</version.plugin.directory>
         <version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
-        <version.plugin.enforcer>3.0.0-M1</version.plugin.enforcer>
-        <version.plugin.exec>1.6.0</version.plugin.exec>
+        <version.plugin.enforcer>3.3.0</version.plugin.enforcer>
+        <version.plugin.exec>3.1.0</version.plugin.exec>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
         <version.plugin.glassfish-copyright>2.3</version.plugin.glassfish-copyright>
         <version.plugin.helidon-build-tools>3.0.5</version.plugin.helidon-build-tools>
         <version.plugin.hibernate-enhance>${version.lib.hibernate}</version.plugin.hibernate-enhance>
         <version.plugin.jacoco>0.8.5</version.plugin.jacoco>
-        <version.plugin.jandex>1.1.0</version.plugin.jandex>
+        <version.plugin.jandex>1.2.3</version.plugin.jandex>
         <version.plugin.jar>3.0.2</version.plugin.jar>
-        <version.plugin.javadoc>3.3.1</version.plugin.javadoc>
+        <version.plugin.javadoc>3.5.0</version.plugin.javadoc>
         <version.plugin.jaxb>2.5.0</version.plugin.jaxb>
         <version.plugin.license>1.16</version.plugin.license>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
         <version.plugin.project-info-reports>3.0.0</version.plugin.project-info-reports>
         <version.plugin.protobuf>0.6.1</version.plugin.protobuf>
-        <version.plugin.resources>2.7</version.plugin.resources>
+        <version.plugin.resources>3.3.1</version.plugin.resources>
         <version.plugin.scm-publish-plugin>3.0.0</version.plugin.scm-publish-plugin>
-        <version.plugin.shade>3.0.0</version.plugin.shade>
-        <version.plugin.source>3.0.1</version.plugin.source>
+        <version.plugin.shade>3.5.0</version.plugin.shade>
+        <version.plugin.source>3.3.0</version.plugin.source>
         <version.plugin.spotbugs>4.4.2.2</version.plugin.spotbugs>
         <version.plugin.findsecbugs>1.11.0</version.plugin.findsecbugs>
         <version.plugin.dependency-check>8.3.1</version.plugin.dependency-check>
-        <version.plugin.surefire>3.0.0-M5</version.plugin.surefire>
+        <version.plugin.surefire>3.0.0</version.plugin.surefire>
         <version.plugin.toolchains>1.1</version.plugin.toolchains>
         <version.plugin.version-plugin>2.3</version.plugin.version-plugin>
-        <version.plugin.buildnumber>1.4</version.plugin.buildnumber>
+        <version.plugin.buildnumber>3.2.0</version.plugin.buildnumber>
         <version.plugin.wiremock>2.14.0</version.plugin.wiremock>
 
         <version.helidon-cli>3.0.0</version.helidon-cli>
@@ -247,7 +247,6 @@
                         <!-- we are not interested in each file that is generated -->
                         <quiet>true</quiet>
                         <!--<verbose>true</verbose>-->
-                        <isOffline>true</isOffline>
                         <offlineLinks>
                             <offlineLink>
                                 <url>${javadoc.link.jackson-annotations}</url>

diff --git a/tests/integration/jpa/simple/pom.xml b/tests/integration/jpa/simple/pom.xml
@@ -154,7 +154,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${version.plugin.surefire}</version>
                 <configuration>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ServerBasicConfig.java b/webserver/webserver/src/main/java/io/helidon/webserver/ServerBasicConfig.java
@@ -70,21 +70,25 @@ class ServerBasicConfig implements ServerConfiguration {
     }
 
     @Override
+    @SuppressWarnings({"deprecation", "removal"})
     public SSLContext ssl() {
         return socketConfig.ssl();
     }
 
     @Override
+    @SuppressWarnings({"deprecation", "removal"})
     public Set<String> enabledSslProtocols() {
         return socketConfig.enabledSslProtocols();
     }
 
     @Override
+    @SuppressWarnings({"deprecation", "removal"})
     public Set<String> allowedCipherSuite() {
         return socketConfig.allowedCipherSuite();
     }
 
     @Override
+    @SuppressWarnings({"deprecation", "removal"})
     public ClientAuthentication clientAuth() {
         return socketConfig.clientAuth();
     }
@@ -289,21 +293,25 @@ public Optional<WebServerTls> tls() {
         }
 
         @Override
+        @SuppressWarnings({"deprecation", "removal"})
         public SSLContext ssl() {
             return tls().map(WebServerTls::sslContext).orElse(null);
         }
 
         @Override
+        @SuppressWarnings({"deprecation", "removal"})
         public Set<String> enabledSslProtocols() {
             return tls().map(WebServerTls::enabledTlsProtocols).map(Set::copyOf).orElseGet(Set::of);
         }
 
         @Override
+        @SuppressWarnings({"deprecation", "removal"})
         public Set<String> allowedCipherSuite() {
             return tls().map(WebServerTls::cipherSuite).orElseGet(Set::of);
         }
 
         @Override
+        @SuppressWarnings({"deprecation", "removal"})
         public ClientAuthentication clientAuth() {
             return tls().map(WebServerTls::clientAuth).orElse(ClientAuthentication.NONE);
         }

diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/BytesReuseV2ApiTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/BytesReuseV2ApiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@ public class BytesReuseV2ApiTest {
      *             the port is dynamically selected
      * @throws Exception in case of an error
      */
+    @SuppressWarnings({"deprecation", "removal"})
     private static void startServer(int port) throws Exception {
         webServer = WebServer.builder()
                 .host("localhost")

diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/CloseConnectionV2ApiTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/CloseConnectionV2ApiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@ public class CloseConnectionV2ApiTest {
     private final ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
 
     @BeforeEach
+    @SuppressWarnings({"deprecation", "removal"})
     void setUp() throws UnknownHostException {
         closedConnectionFuture = new CompletableFuture<>();
         InetAddress localHost = InetAddress.getLocalHost();

diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/CompressionV2ApiTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/CompressionV2ApiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,6 +69,7 @@ public static void close() throws Exception {
      * the port is dynamically selected
      * @throws Exception in case of an error
      */
+    @SuppressWarnings({"deprecation", "removal"})
     private static void startServer(int port) throws Exception {
         webServer = WebServer.builder()
                 .host("localhost")

diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/EncodingV2ApiTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/EncodingV2ApiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ public class EncodingV2ApiTest {
      * the port is dynamically selected
      * @throws Exception in case of an error
      */
+    @SuppressWarnings({"deprecation", "removal"})
     private static void startServer(int port) throws Exception {
         webServer = WebServer.builder()
                 .host("localhost")

diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/FilterV2ApiTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/FilterV2ApiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@ public class FilterV2ApiTest {
      *             the port is dynamically selected
      * @throws Exception in case of an error
      */
+    @SuppressWarnings({"deprecation", "removal"})
     private static void startServer(int port) {
         webServer = WebServer.builder()
                 .host("localhost")