removing mvn.tail

tiagobento · Sep 30, 2024 · 8363fec · 8363fec
1 parent 076fb41
commit 8363fec
Show file tree

Hide file tree

Showing 43 changed files with 150 additions and 587 deletions.
diff --git a/examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js b/examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js
@@ -18,9 +18,9 @@
  */
 
 const buildEnv = require("./env");
-const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper");
+const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper");
 
 setupMavenConfigFile(`
     -Drevision=${buildEnv.env.droolsProcessUsertasksQuarkusExample.version}
-    -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")}
+    -Dmaven.repo.local.tail=${buildTailFromPackageJson()}
 `);
diff --git a/examples/drools-process-usertasks-quarkus-example/mvn.tail.js b/examples/drools-process-usertasks-quarkus-example/mvn.tail.js
diff --git a/examples/drools-process-usertasks-quarkus-example/pom.xml b/examples/drools-process-usertasks-quarkus-example/pom.xml
@@ -33,7 +33,23 @@
   <name>Kie-Tools Example :: Process with Usertasks Quarkus</name>
   <description>Kogito user tasks orchestration - Quarkus</description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-quarkus-devui-bom</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <dependency>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-quarkus-devui</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy</artifactId>
@@ -74,35 +90,6 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>kie-tools--maven-profile--1st-party-dependencies</id>
-      <activation>
-        <property>
-          <name>ignore--kie-tools--maven-profile--1st-party-dependencies</name>
-          <value>!true</value>
-        </property>
-      </activation>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.jbpm</groupId>
-            <artifactId>jbpm-quarkus-devui-bom</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.jbpm</groupId>
-          <artifactId>jbpm-quarkus-devui</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
   <build>
     <finalName>${project.artifactId}</finalName>
     <plugins>

diff --git a/examples/jbpm-compact-architecture-example/mvn.bootstrap.js b/examples/jbpm-compact-architecture-example/mvn.bootstrap.js
@@ -18,11 +18,15 @@
  */
 
 const buildEnv = require("./env");
-const { setupMavenConfigFile, setPomProperty } = require("@kie-tools/maven-config-setup-helper");
+const {
+  setupMavenConfigFile,
+  setPomProperty,
+  buildTailFromPackageJson,
+} = require("@kie-tools/maven-config-setup-helper");
 
 setupMavenConfigFile(`
     -Drevision=${buildEnv.env.jbpmCompactArchitectureExample.version}
-    -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")}
+    -Dmaven.repo.local.tail=${buildTailFromPackageJson()}
 `);
 
 setPomProperty({

diff --git a/examples/jbpm-compact-architecture-example/mvn.tail.js b/examples/jbpm-compact-architecture-example/mvn.tail.js
diff --git a/examples/jbpm-compact-architecture-example/pom.xml b/examples/jbpm-compact-architecture-example/pom.xml
@@ -39,6 +39,18 @@
     <kogito.task-console.image>docker.io/apache/incubator-kie-kogito-task-console:main</kogito.task-console.image>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-quarkus-devui-bom</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -121,32 +133,6 @@
   </dependencies>
 
   <profiles>
-    <profile>
-      <id>kie-tools--maven-profile--1st-party-dependencies</id>
-      <activation>
-        <property>
-          <name>ignore--kie-tools--maven-profile--1st-party-dependencies</name>
-          <value>!true</value>
-        </property>
-      </activation>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.jbpm</groupId>
-            <artifactId>jbpm-quarkus-devui-bom</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.jbpm</groupId>
-          <artifactId>jbpm-quarkus-devui</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>container</id>
       <properties>

diff --git a/examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js b/examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js
@@ -18,9 +18,9 @@
  */
 
 const buildEnv = require("./env");
-const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper");
+const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper");
 
 setupMavenConfigFile(`
     -Drevision=${buildEnv.env.sonataflowGreetingQuarkus.version}
-    -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")}
+    -Dmaven.repo.local.tail=${buildTailFromPackageJson()}
 `);
diff --git a/examples/sonataflow-greeting-quarkus-example/mvn.tail.js b/examples/sonataflow-greeting-quarkus-example/mvn.tail.js
diff --git a/examples/sonataflow-greeting-quarkus-example/pom.xml b/examples/sonataflow-greeting-quarkus-example/pom.xml
@@ -38,7 +38,23 @@
   <name>KIE Tools Example :: SonataFlow Greeting :: Quarkus</name>
   <description>SonataFlow Example - Quarkus</description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.kie.sonataflow</groupId>
+        <artifactId>sonataflow-quarkus-devui-bom</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <dependency>
+      <groupId>org.apache.kie.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-devui</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.kie.sonataflow</groupId>
       <artifactId>sonataflow-quarkus</artifactId>
@@ -115,32 +131,6 @@
     </plugins>
   </build>
   <profiles>
-    <profile>
-      <id>kie-tools--maven-profile--1st-party-dependencies</id>
-      <activation>
-        <property>
-          <name>ignore--kie-tools--maven-profile--1st-party-dependencies</name>
-          <value>!true</value>
-        </property>
-      </activation>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.kie.sonataflow</groupId>
-            <artifactId>sonataflow-quarkus-devui-bom</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.kie.sonataflow</groupId>
-          <artifactId>sonataflow-quarkus-devui</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>container</id>
       <activation>

diff --git a/packages/dashbuilder/mvn.bootstrap.js b/packages/dashbuilder/mvn.bootstrap.js
@@ -18,9 +18,9 @@
  */
 
 const buildEnv = require("./env");
-const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper");
+const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper");
 
 setupMavenConfigFile(`
     -Drevision=${buildEnv.env.dashbuilder.version}
-    -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")}
+    -Dmaven.repo.local.tail=${buildTailFromPackageJson()}
 `);
diff --git a/packages/dashbuilder/mvn.tail.js b/packages/dashbuilder/mvn.tail.js
diff --git a/packages/dev-deployment-base-image/mvn.bootstrap.js b/packages/dev-deployment-base-image/mvn.bootstrap.js
@@ -18,11 +18,11 @@
  */
 
 const buildEnv = require("./env");
-const { setupMavenConfigFile, installMvnw } = require("@kie-tools/maven-config-setup-helper");
+const { setupMavenConfigFile, installMvnw, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper");
 
 setupMavenConfigFile(`
     -Drevision=${buildEnv.env.devDeploymentBaseImage.version}
-    -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")}
+    -Dmaven.repo.local.tail=${buildTailFromPackageJson()}
 `);
 
 installMvnw();
diff --git a/packages/dev-deployment-base-image/mvn.tail.js b/packages/dev-deployment-base-image/mvn.tail.js
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json
@@ -30,7 +30,7 @@
     "image:docker:build": "kie-tools--image-builder build --allowHostNetworkAccess -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.buildTag)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/",
     "install": "node install.js",
     "m2-repo-via-http:container:kill": "(docker container kill m2-repo-via-http || true) && (docker container rm m2-repo-via-http || true)",
-    "m2-repo-via-http:container:prepare-m2-repo-volume": "node -e 'require(`@kie-tools/maven-config-setup-helper`).prepareHardLinkedM2FromTail(`./dist/tmp-m2/repository`, require(`@kie-tools/dev-deployment-kogito-quarkus-blank-app/mvn.tail`))'",
+    "m2-repo-via-http:container:prepare-m2-repo-volume": "node -e 'require(`@kie-tools/maven-config-setup-helper`).prepareHardLinkedM2ForPackage(`./dist/tmp-m2/repository`, `./node_modules/@kie-tools/dev-deployment-kogito-quarkus-blank-app`)'",
     "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && pnpm m2-repo-via-http:container:prepare-m2-repo-volume && docker run -p 8888:80 --name m2-repo-via-http -v \"./dist/tmp-m2/repository:/var/www/html\" -dit $(build-env devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImage)",
     "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command"
   },

diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js b/packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js
@@ -18,7 +18,7 @@
  */
 
 const buildEnv = require("./env");
-const { setupMavenConfigFile, installMvnw } = require("@kie-tools/maven-config-setup-helper");
+const { setupMavenConfigFile, installMvnw, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper");
 
 setupMavenConfigFile(
   `
@@ -27,7 +27,7 @@ setupMavenConfigFile(
     -Drevision=${buildEnv.env.devDeploymentQuarkusApp.version}
     -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version}
     -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version}
-    -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")}
+    -Dmaven.repo.local.tail=${buildTailFromPackageJson()}
 `,
   { ignoreDefault: true } // Can't have special <repositories> configuration that only works inside this repo.
 );