This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new d747a65eecb kie-issues#1118: On KIE Tools, `maven-base` module should
point to `apache` as parent pom (#2265)
d747a65eecb is described below
commit d747a65eecba9817c8a57f2e93e1ee2bab084610
Author: Yeser Amer <[email protected]>
AuthorDate: Thu Apr 25 00:58:57 2024 +0200
kie-issues#1118: On KIE Tools, `maven-base` module should point to `apache`
as parent pom (#2265)
---
packages/jbpm-quarkus-devui/env/index.js | 2 +-
packages/jbpm-quarkus-devui/package.json | 4 +--
packages/maven-base/env/index.js | 14 ++++++++--
packages/maven-base/package.json | 4 +--
packages/maven-base/pom.xml | 36 +++++---------------------
packages/sonataflow-quarkus-devui/env/index.js | 4 +--
packages/sonataflow-quarkus-devui/package.json | 4 +--
7 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/packages/jbpm-quarkus-devui/env/index.js
b/packages/jbpm-quarkus-devui/env/index.js
index e093fcea57d..6982d036d6f 100644
--- a/packages/jbpm-quarkus-devui/env/index.js
+++ b/packages/jbpm-quarkus-devui/env/index.js
@@ -19,7 +19,7 @@
const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
-module.exports = composeEnv([require("@kie-tools/root-env/env")], {
+module.exports = composeEnv([require("@kie-tools/root-env/env"),
require("@kie-tools/maven-base/env")], {
vars: varsWithName({}),
get env() {
return {
diff --git a/packages/jbpm-quarkus-devui/package.json
b/packages/jbpm-quarkus-devui/package.json
index c6b62f532cc..30efd53cc8c 100644
--- a/packages/jbpm-quarkus-devui/package.json
+++ b/packages/jbpm-quarkus-devui/package.json
@@ -17,8 +17,8 @@
"build:dev:darwin:linux": "mvn clean install -DskipTests",
"build:dev:win32": "pnpm powershell \"mvn clean install -DskipTests \"",
"build:prod": "pnpm lint && run-script-os",
- "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env
tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)",
- "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests
`-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"",
+ "build:prod:darwin:linux": "mvn clean deploy -DdeployAtEnd
-DskipTests=$(build-env tests.run --not)
-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)
-Dmaven.deploy.skip=$(build-env maven.deploy.skip)",
+ "build:prod:win32": "pnpm powershell \"mvn clean deploy `-DdeployAtEnd
`-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)
`-Dmaven.deploy.skip=$(build-env maven.deploy.skip)\"",
"install": "node install.js",
"lint": "echo 'Linting'",
"powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted
-Command",
diff --git a/packages/maven-base/env/index.js b/packages/maven-base/env/index.js
index eb80c4dbd97..7cba7bac345 100644
--- a/packages/maven-base/env/index.js
+++ b/packages/maven-base/env/index.js
@@ -17,15 +17,25 @@
* under the License.
*/
-const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
+const { varsWithName, composeEnv, getOrDefault } =
require("@kie-tools-scripts/build-env");
module.exports = composeEnv([require("@kie-tools/root-env/env")], {
- vars: varsWithName({}),
+ vars: varsWithName({
+ KIE_TOOLS_BUILD__mavenDeploySkip: {
+ default: "true",
+ description: "Determines if a Maven build skips a deploy",
+ },
+ }),
get env() {
return {
mavenBase: {
version: require("../package.json").version,
},
+ maven: {
+ deploy: {
+ skip: getOrDefault(this.vars.KIE_TOOLS_BUILD__mavenDeploySkip),
+ },
+ },
};
},
});
diff --git a/packages/maven-base/package.json b/packages/maven-base/package.json
index ab18e994e1d..439371a2348 100644
--- a/packages/maven-base/package.json
+++ b/packages/maven-base/package.json
@@ -17,8 +17,8 @@
"build:dev:darwin:linux": "mvn clean install -DskipTests",
"build:dev:win32": "pnpm powershell \"mvn clean install -DskipTests \"",
"build:prod": "pnpm lint && run-script-os",
- "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env
tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)",
- "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests
`-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"",
+ "build:prod:darwin:linux": "mvn clean deploy -DdeployAtEnd
-DskipTests=$(build-env tests.run --not)
-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)
-Dmaven.deploy.skip=$(build-env maven.deploy.skip)",
+ "build:prod:win32": "pnpm powershell \"mvn clean deploy `-DdeployAtEnd
`-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)
`-Dmaven.deploy.skip=$(build-env maven.deploy.skip)\"",
"install": "node install.js",
"lint": "echo 'Linting'",
"powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted
-Command"
diff --git a/packages/maven-base/pom.xml b/packages/maven-base/pom.xml
index 24f9ecc8b91..610299156d3 100644
--- a/packages/maven-base/pom.xml
+++ b/packages/maven-base/pom.xml
@@ -23,6 +23,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>32</version>
+ </parent>
+
<groupId>org.kie</groupId>
<artifactId>kie-tools-maven-base</artifactId>
<version>${revision}</version>
@@ -41,36 +47,6 @@
<version.flatten.plugin>1.3.0</version.flatten.plugin>
</properties>
- <repositories>
- <repository>
- <!-- Duplicating the Maven Central repository here (as it is already
coming from Super POM) makes the build much faster,
- as the Maven Central is now treated as the first (default)
repository (because it is before the Apache Nexus one).
- Artifacts with release (fixed) versions are being downloaded
primarily from there. Without the central being the
- first repository the Apache Nexus would be contacted first and
since it is quite slow it slows down the build.
- We use Apache repo only to download our SNAPSHOTs. -->
- <id>central</id>
- <name>Central Repository</name>
- <url>https://repo.maven.apache.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-public-repository-group</id>
- <name>Apache Public Repository Group</name>
- <url>https://repository.apache.org/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/packages/sonataflow-quarkus-devui/env/index.js
b/packages/sonataflow-quarkus-devui/env/index.js
index 33ffd575a68..16df856c3b8 100644
--- a/packages/sonataflow-quarkus-devui/env/index.js
+++ b/packages/sonataflow-quarkus-devui/env/index.js
@@ -17,9 +17,9 @@
* under the License.
*/
-const { varsWithName, composeEnv, getOrDefault } =
require("@kie-tools-scripts/build-env");
+const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
-module.exports = composeEnv([require("@kie-tools/root-env/env")], {
+module.exports = composeEnv([require("@kie-tools/root-env/env"),
require("@kie-tools/maven-base/env")], {
vars: varsWithName({}),
get env() {
return {
diff --git a/packages/sonataflow-quarkus-devui/package.json
b/packages/sonataflow-quarkus-devui/package.json
index c1d9bd09606..a24630902bd 100644
--- a/packages/sonataflow-quarkus-devui/package.json
+++ b/packages/sonataflow-quarkus-devui/package.json
@@ -17,8 +17,8 @@
"build:dev:darwin:linux": "mvn clean install -DskipTests",
"build:dev:win32": "pnpm powershell \"mvn clean install -DskipTests \"",
"build:prod": "pnpm lint && run-script-os",
- "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env
tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)",
- "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests
`-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"",
+ "build:prod:darwin:linux": "mvn clean deploy -DdeployAtEnd
-DskipTests=$(build-env tests.run --not)
-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)
-Dmaven.deploy.skip=$(build-env maven.deploy.skip)",
+ "build:prod:win32": "pnpm powershell \"mvn clean deploy `-DdeployAtEnd
`-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)
`-Dmaven.deploy.skip=$(build-env maven.deploy.skip)\"",
"install": "node install.js",
"lint": "echo 'Linting'",
"powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted
-Command",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
