[JAVA-21185] Clean up (#14138)

* [JAVA-21185] Clean up * [JAVA-21185] Clean up * [JAVA-21185] Clean up * Revert "[JAVA-21185] Clean up" This reverts commit 485b1b86a908ff047ba246d344392f531437c7af. * Revert "[JAVA-21185] Clean up" This reverts commit 13faeab4814ac44340a93ef67e0010bdc12799e1.
2023-05-31 17:49:13 +03:00 · 2023-05-31 17:49:13 +03:00 · 96d9c01696
parent dda5540de3
commit 96d9c01696
9 changed files with 37 additions and 38 deletions
--- a/quarkus-modules/quarkus-extension/quarkus-liquibase/deployment/pom.xml
+++ b/quarkus-modules/quarkus-extension/quarkus-liquibase/deployment/pom.xml
@ -41,7 +41,6 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.plugin.version}</version>
                <configuration>
                    <annotationProcessorPaths>
                        <path>
@ -55,8 +54,4 @@
        </plugins>
    </build>

-    <properties>
-        <compiler.plugin.version>3.8.1</compiler.plugin.version>
-    </properties>
-
 </project>
--- a/quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/pom.xml
+++ b/quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/pom.xml
@ -52,7 +52,6 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.plugin.version}</version>
                <configuration>
                    <annotationProcessorPaths>
                        <path>
@ -68,7 +67,6 @@

    <properties>
        <liquibase-core.version>3.8.1</liquibase-core.version>
-        <compiler.plugin.version>3.8.1</compiler.plugin.version>
        <liquibase.version>3.8.1</liquibase.version>
    </properties>

--- a/quarkus-modules/quarkus-funqy/pom.xml
+++ b/quarkus-modules/quarkus-funqy/pom.xml
@ -6,17 +6,7 @@
    <groupId>com.baeldung.quarkus</groupId>
    <artifactId>quarkus-funqy</artifactId>
    <version>1.0.0-SNAPSHOT</version>
-    <properties>
-        <compiler-plugin.version>3.10.1</compiler-plugin.version>
-        <failsafe.useModulePath>false</failsafe.useModulePath>
-        <maven.compiler.release>17</maven.compiler.release>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>2.16.0.Final</quarkus.platform.version>
-        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
-    </properties>
+
    <parent>
        <groupId>com.baeldung</groupId>
        <artifactId>quarkus-modules</artifactId>
@ -131,4 +121,16 @@
            </properties>
        </profile>
    </profiles>
+
+    <properties>
+        <compiler-plugin.version>3.10.1</compiler-plugin.version>
+        <failsafe.useModulePath>false</failsafe.useModulePath>
+        <maven.compiler.release>17</maven.compiler.release>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+        <quarkus.platform.version>2.16.0.Final</quarkus.platform.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
+    </properties>
 </project>
--- a/quarkus-modules/quarkus-jandex/hello-app/pom.xml
+++ b/quarkus-modules/quarkus-jandex/hello-app/pom.xml
@ -76,7 +76,6 @@
            </plugin>
            <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
                <configuration>
                    <parameters>${maven.compiler.parameters}</parameters>
                </configuration>
--- a/quarkus-modules/quarkus-jandex/hello-sender-maven-plugin/pom.xml
+++ b/quarkus-modules/quarkus-jandex/hello-sender-maven-plugin/pom.xml
@ -29,7 +29,7 @@
                <!-- https://github.com/wildfly/jandex-maven-plugin -->
                <groupId>org.jboss.jandex</groupId>
                <artifactId>jandex-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>${jandex-maven-plugin.version}</version>
                <executions>
                    <execution>
                        <id>make-index</id>
@ -43,4 +43,8 @@
        </plugins>
    </build>

+    <properties>
+        <jandex-maven-plugin.version>1.2.1</jandex-maven-plugin.version>
+    </properties>
+
 </project>
--- a/quarkus-modules/quarkus-jandex/pom.xml
+++ b/quarkus-modules/quarkus-jandex/pom.xml
@ -38,7 +38,6 @@
    </dependencyManagement>

    <properties>
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
        <maven.compiler.parameters>true</maven.compiler.parameters>
        <maven.compiler.source>11</maven.compiler.source>
        <maven.compiler.target>11</maven.compiler.target>
--- a/quarkus-modules/quarkus-vs-springboot/spring-project/pom.xml
+++ b/quarkus-modules/quarkus-vs-springboot/spring-project/pom.xml
@ -3,7 +3,6 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
    <artifactId>spring-project</artifactId>
    <version>0.1-SNAPSHOT</version>

@ -19,7 +18,7 @@
            <dependency>
                <groupId>org.testcontainers</groupId>
                <artifactId>testcontainers-bom</artifactId>
-                <version>1.17.2</version>
+                <version>${testcontainers-bom.version}</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
@ -43,7 +42,7 @@
        <dependency>
            <groupId>com.github.jasync-sql</groupId>
            <artifactId>jasync-r2dbc-mysql</artifactId>
-            <version>2.0.8</version>
+            <version>${jasync-r2dbc-mysql.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@ -104,7 +103,6 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
                <configuration>
                    <source>${maven.compiler.source.version}</source>
                    <target>${maven.compiler.target.version}</target>
@ -182,7 +180,7 @@
            <id>local-native</id>
            <properties>
                <repackage.classifier>exec</repackage.classifier>
-                <native-buildtools.version>0.9.11</native-buildtools.version>
+                <native-buildtools.version>${native-buildtools.version}</native-buildtools.version>
            </properties>
            <dependencies>
                <dependency>
@ -241,7 +239,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.0.0-M6</version>
+                        <version>${maven-surefire-plugin.version}</version>
                        <configuration>
                            <argLine>-DspringAot=true
                                -agentlib:native-image-agent=access-filter-file=src/test/resources/access-filter.json,config-merge-dir=target/classes/META-INF/native-image
@ -254,11 +252,15 @@
    </profiles>

    <properties>
+        <testcontainers-bom.version>1.17.2</testcontainers-bom.version>
        <java.version>11</java.version>
        <spring-native.version>0.12.1</spring-native.version>
        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
        <maven.compiler.source.version>11</maven.compiler.source.version>
        <maven.compiler.target.version>11</maven.compiler.target.version>
+        <maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
+        <native-buildtools.version>0.9.11</native-buildtools.version>
+        <jasync-r2dbc-mysql.version>2.0.8</jasync-r2dbc-mysql.version>
    </properties>

 </project>
--- a/saas-modules/sentry-servlet/pom.xml
+++ b/saas-modules/sentry-servlet/pom.xml
@ -3,20 +3,15 @@
    xmlns="http://maven.apache.org/POM/4.0.0"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
+    <artifactId>sentry-servlet</artifactId>
+    <name>sentry-servlet</name>
+    <packaging>war</packaging>
+
    <parent>
        <groupId>com.baeldung</groupId>
        <artifactId>saas-modules</artifactId>
        <version>1.0.0-SNAPSHOT</version>
    </parent>
-    <artifactId>sentry-servlet</artifactId>
-    <name>sentry-servlet</name>
-    <packaging>war</packaging>
-
-    <properties>
-        <sentry.version>6.11.0</sentry.version>
-        <cargo.version>1.10.4</cargo.version>
-        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-    </properties>

    <dependencies>
        <dependency>
@ -37,7 +32,7 @@
            <plugin>
                <groupId>org.codehaus.cargo</groupId>
                <artifactId>cargo-maven3-plugin</artifactId>
-                <version>${cargo.version}</version>
+                <version>${cargo-maven3-plugin.version}</version>
                <configuration>
                    <container>
                        <containerId>tomcat9x</containerId>
@ -47,4 +42,10 @@
            </plugin>
        </plugins>
    </build>
+
+    <properties>
+        <sentry.version>6.11.0</sentry.version>
+        <cargo-maven3-plugin.version>1.10.4</cargo-maven3-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
 </project>
--- a/security-modules/java-ee-8-security-api/pom.xml
+++ b/security-modules/java-ee-8-security-api/pom.xml
@ -34,7 +34,6 @@
        <plugins>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <packagingExcludes>pom.xml</packagingExcludes>