4.x: fix parent </relativePath> (#71)

* Add support for setting </relativePath> * Add </relativePath> to parent * Fix copyright and checkstyle * Fix MainTest --------- Co-authored-by: Romain Grecourt <[email protected]>
helidon-io · Aug 6, 2024 · f078db7 · f078db7
1 parent 9a856b5
commit f078db7
Show file tree

Hide file tree

Showing 113 changed files with 143 additions and 17 deletions.
diff --git a/etc/scripts/updateparent.awk b/etc/scripts/updateparent.awk
@@ -1,6 +1,6 @@
 #!awk -f
 #
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 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.
@@ -26,7 +26,7 @@
 #
 BEGIN {
     if (gavs == "") {
-        print "Must provide one or more GAVs using '-v gavs=g1:a1:v1,g2:a2:v2" 
+        print "Must provide one or more GAVs using '-v gavs=g1:a1:v1,g2:a2:v2"
         exit 1
     }
 
@@ -48,6 +48,7 @@ BEGIN {
     inParent="false"
     parentGroupId=""
     parentArtifactId=""
+    parentRelativePath="false"
     FS="[<>]"
 }
 
@@ -74,12 +75,20 @@ BEGIN {
     }
 }
 
+/<relativePath/ && inParent == "true" {
+    parentRelativePath="true"
+}
+
 /<\/parent>/ {
     inParent="false"
     parentGroupId=""
     parentArtifactId=""
+    if (parentRelativePath == "false") {
+        printf("%s<relativePath/>\n", $1$1)
+    }
 }
 
+
 {
     print $0
 }

diff --git a/examples/config/basics/pom.xml b/examples/config/basics/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.config</groupId>
     <artifactId>helidon-examples-config-basics</artifactId>

diff --git a/examples/config/changes/pom.xml b/examples/config/changes/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.config</groupId>
     <artifactId>helidon-examples-config-changes</artifactId>

diff --git a/examples/config/git/pom.xml b/examples/config/git/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.config</groupId>
     <artifactId>helidon-examples-config-git</artifactId>

diff --git a/examples/config/mapping/pom.xml b/examples/config/mapping/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.config</groupId>
     <artifactId>helidon-examples-config-mapping</artifactId>

diff --git a/examples/config/metadata/pom.xml b/examples/config/metadata/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.config</groupId>
     <artifactId>helidon-examples-config-metadata</artifactId>

diff --git a/examples/config/overrides/pom.xml b/examples/config/overrides/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.config</groupId>
     <artifactId>helidon-examples-config-overrides</artifactId>

diff --git a/examples/config/profiles/pom.xml b/examples/config/profiles/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.config</groupId>
     <artifactId>helidon-examples-config-profiles</artifactId>

diff --git a/examples/config/sources/pom.xml b/examples/config/sources/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.config</groupId>
     <artifactId>helidon-examples-config-sources</artifactId>

diff --git a/examples/cors/pom.xml b/examples/cors/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples</groupId>
     <artifactId>helidon-examples-cors</artifactId>

diff --git a/examples/dbclient/jdbc/pom.xml b/examples/dbclient/jdbc/pom.xml
@@ -23,6 +23,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <artifactId>helidon-examples-dbclient-jdbc</artifactId>

diff --git a/examples/dbclient/mongodb/pom.xml b/examples/dbclient/mongodb/pom.xml
@@ -23,6 +23,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <artifactId>helidon-examples-dbclient-mongodb</artifactId>

diff --git a/examples/dbclient/pokemons/pom.xml b/examples/dbclient/pokemons/pom.xml
@@ -23,6 +23,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <artifactId>helidon-examples-dbclient-pokemons</artifactId>

diff --git a/examples/employee-app/pom.xml b/examples/employee-app/pom.xml
@@ -26,6 +26,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.employee</groupId>
     <artifactId>helidon-examples-employee-app</artifactId>

diff --git a/examples/graphql/basics/pom.xml b/examples/graphql/basics/pom.xml
@@ -23,6 +23,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.graphql</groupId>
     <artifactId>helidon-examples-graphql-basics</artifactId>

diff --git a/examples/health/basics/pom.xml b/examples/health/basics/pom.xml
@@ -23,6 +23,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.health</groupId>
     <artifactId>helidon-examples-health-basics</artifactId>

diff --git a/examples/integrations/cdi/datasource-hikaricp-h2/pom.xml b/examples/integrations/cdi/datasource-hikaricp-h2/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.integrations.cdi</groupId>
     <artifactId>helidon-integrations-examples-datasource-hikaricp-h2</artifactId>

diff --git a/examples/integrations/cdi/datasource-hikaricp-mysql/pom.xml b/examples/integrations/cdi/datasource-hikaricp-mysql/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.integrations.cdi</groupId>
     <artifactId>helidon-integrations-examples-datasource-hikaricp-mysql</artifactId>

diff --git a/examples/integrations/cdi/datasource-hikaricp/pom.xml b/examples/integrations/cdi/datasource-hikaricp/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.integrations.cdi</groupId>
     <artifactId>helidon-examples-integrations-datasource-hikaricp</artifactId>

diff --git a/examples/integrations/cdi/jpa/pom.xml b/examples/integrations/cdi/jpa/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.integrations.cdi</groupId>
     <artifactId>helidon-integrations-examples-jpa</artifactId>

diff --git a/examples/integrations/cdi/pokemons/pom.xml b/examples/integrations/cdi/pokemons/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.integrations.cdi</groupId>
     <artifactId>helidon-integrations-examples-pokemons</artifactId>

diff --git a/examples/integrations/micrometer/mp/pom.xml b/examples/integrations/micrometer/mp/pom.xml
@@ -23,6 +23,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -104,4 +105,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/examples/integrations/micrometer/se/pom.xml b/examples/integrations/micrometer/se/pom.xml
@@ -23,6 +23,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.micrometer-project</groupId>

diff --git a/examples/integrations/micronaut/data/pom.xml b/examples/integrations/micronaut/data/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <artifactId>helidon-examples-integrations-micronaut-data</artifactId>
     <version>1.0.0-SNAPSHOT</version>

diff --git a/examples/integrations/microstream/greetings-mp/pom.xml b/examples/integrations/microstream/greetings-mp/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <artifactId>helidon-examples-integrations-microstream-greetings-mp</artifactId>
@@ -81,4 +82,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/examples/integrations/microstream/greetings-se/pom.xml b/examples/integrations/microstream/greetings-se/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <artifactId>helidon-examples-integrations-microstream-greetings-se</artifactId>

diff --git a/examples/integrations/neo4j/pom.xml b/examples/integrations/neo4j/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <artifactId>helidon-examples-integration-neo4j</artifactId>
     <version>1.0.0-SNAPSHOT</version>

diff --git a/examples/integrations/oci/atp-cdi/pom.xml b/examples/integrations/oci/atp-cdi/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.oci</groupId>

diff --git a/examples/integrations/oci/atp/pom.xml b/examples/integrations/oci/atp/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.oci</groupId>

diff --git a/examples/integrations/oci/metrics/pom.xml b/examples/integrations/oci/metrics/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <properties>

diff --git a/examples/integrations/oci/objectstorage-cdi/pom.xml b/examples/integrations/oci/objectstorage-cdi/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.oci</groupId>

diff --git a/examples/integrations/oci/objectstorage/pom.xml b/examples/integrations/oci/objectstorage/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.oci</groupId>

diff --git a/examples/integrations/oci/vault-cdi/pom.xml b/examples/integrations/oci/vault-cdi/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.oci</groupId>

diff --git a/examples/integrations/oci/vault/pom.xml b/examples/integrations/oci/vault/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.oci</groupId>

diff --git a/examples/integrations/vault/hcp-cdi/pom.xml b/examples/integrations/vault/hcp-cdi/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.vault</groupId>

diff --git a/examples/integrations/vault/hcp/pom.xml b/examples/integrations/vault/hcp/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>io.helidon.examples.integrations.vault</groupId>

diff --git a/examples/jbatch/pom.xml b/examples/jbatch/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.jbatch</groupId>
     <artifactId>helidon-examples-jbatch</artifactId>

diff --git a/examples/logging/jul/pom.xml b/examples/logging/jul/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.logging</groupId>
     <artifactId>helidon-examples-logging-jul</artifactId>

diff --git a/examples/logging/log4j/pom.xml b/examples/logging/log4j/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.logging</groupId>
     <artifactId>helidon-examples-logging-log4j</artifactId>

diff --git a/examples/logging/logback-aot/pom.xml b/examples/logging/logback-aot/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.logging</groupId>
     <artifactId>helidon-examples-logging-slf4j-aot</artifactId>

diff --git a/examples/logging/slf4j/pom.xml b/examples/logging/slf4j/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.logging</groupId>
     <artifactId>helidon-examples-logging-slf4j</artifactId>

diff --git a/examples/media/multipart/pom.xml b/examples/media/multipart/pom.xml
@@ -25,6 +25,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-se</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.media</groupId>
     <artifactId>helidon-examples-media-multipart</artifactId>

diff --git a/examples/messaging/jms-websocket-mp/pom.xml b/examples/messaging/jms-websocket-mp/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>4.1.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>io.helidon.examples.jms</groupId>
     <artifactId>helidon-examples-jms-websocket-mp</artifactId>