From 6e9b092d9bc937a61df9418face8dae103126c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 12 Oct 2024 13:41:26 +0200 Subject: [PATCH] REMOVEAFTERFIX --- Jenkinsfile | 2 +- .../distributions/nucleus-common/src/main/resources/bin/nadmin | 1 + nucleus/distributions/pom.xml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c2a0b3307b8..5f22fc15b68 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -190,7 +190,7 @@ spec: # Validate the structure in all submodules (especially version ids) mvn -B -e -fae clean validate -Ptck,set-version-id,staging # Until we fix ANTLR in cmp-support-sqlstore, broken in parallel builds. Just -Pfast after the fix. - mvn -B -e install -Pfastest,staging -T4C + mvn -B -e install -Pfastest,staging ./gfbuild.sh archive_bundles ./gfbuild.sh archive_embedded mvn -B -e clean -Pstaging diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/nadmin b/nucleus/distributions/nucleus-common/src/main/resources/bin/nadmin index 9cfd62ed4c4..bb32695fb9a 100644 --- a/nucleus/distributions/nucleus-common/src/main/resources/bin/nadmin +++ b/nucleus/distributions/nucleus-common/src/main/resources/bin/nadmin @@ -22,6 +22,7 @@ case "`uname`" in esac . "${AS_INSTALL}/config/asenv.conf" JAVA=java +env | sort #Depends upon Java from asenv.conf if [ ${AS_JAVA} ]; then JAVA=${AS_JAVA}/bin/java diff --git a/nucleus/distributions/pom.xml b/nucleus/distributions/pom.xml index fab8485d51c..4be5c966f71 100644 --- a/nucleus/distributions/pom.xml +++ b/nucleus/distributions/pom.xml @@ -133,6 +133,9 @@ exec + + true + ${nadmin.executable} ${create-domain.args}