This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 54a7a5d7e1d utils: rename cloud-utils-*-SHADED.jar to
cloud-utils-*-bundled.jar to fix the build error on MacOS (#7944)
54a7a5d7e1d is described below
commit 54a7a5d7e1def8faa72763ee103c8c16652ea3ae
Author: Wei Zhou <[email protected]>
AuthorDate: Thu Sep 7 08:49:06 2023 +0200
utils: rename cloud-utils-*-SHADED.jar to cloud-utils-*-bundled.jar to fix
the build error on MacOS (#7944)
This fixes the build error of cloud-utils on MacOS
```
[ERROR] Failed to execute goal
org.apache.maven.plugins:maven-shade-plugin:3.0.0:shade (rebuild-war) on
project cloud-utils: Error creating shaded jar: Could not replace original
artifact with shaded artifact!:
/Users/nicolas/cloudstack/utils/target/cloud-utils-4.19.0.0-SNAPSHOT-shaded.jar
(No such file or directory) -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e
switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions,
please read the following articles:
[ERROR] [Help 1]
http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the
command
[ERROR] mvn <args> -rf :cloud-utils
```
---
debian/rules | 2 +-
packaging/centos7/cloud.spec | 2 +-
packaging/centos8/cloud.spec | 2 +-
utils/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/rules b/debian/rules
index 2f160cc5c24..2d07c5e5728 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,7 +135,7 @@ override_dh_auto_install:
install -D systemvm/dist/* $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/
# We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack
to get it into the right place
install -D agent/target/dependencies/jasypt-1.9.3.jar
$(DESTDIR)/usr/share/$(PACKAGE)-common/lib
- install -D utils/target/cloud-utils-$(VERSION)-SHADED.jar
$(DESTDIR)/usr/share/$(PACKAGE)-common/lib/$(PACKAGE)-utils.jar
+ install -D utils/target/cloud-utils-$(VERSION)-bundled.jar
$(DESTDIR)/usr/share/$(PACKAGE)-common/lib/$(PACKAGE)-utils.jar
# cloudstack-python
mkdir -p $(DESTDIR)/usr/share/pyshared
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index e498fed25a1..0fe1a81a6cf 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -302,7 +302,7 @@ ln -sf log4j-cloud.xml
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j
install python/bindir/cloud-external-ipallocator.py
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
install -D client/target/pythonlibs/jasypt-1.9.3.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.3.jar
-install -D utils/target/cloud-utils-%{_maventag}-SHADED.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/%{name}-utils.jar
+install -D utils/target/cloud-utils-%{_maventag}-bundled.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/%{name}-utils.jar
install -D packaging/centos7/cloud-ipallocator.rc
${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator
install -D packaging/centos7/cloud.limits
${RPM_BUILD_ROOT}%{_sysconfdir}/security/limits.d/cloud
diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec
index 57b16543ba8..ce425d38165 100644
--- a/packaging/centos8/cloud.spec
+++ b/packaging/centos8/cloud.spec
@@ -284,7 +284,7 @@ ln -sf log4j-cloud.xml
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j
install python/bindir/cloud-external-ipallocator.py
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
install -D client/target/pythonlibs/jasypt-1.9.3.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.3.jar
-install -D utils/target/cloud-utils-%{_maventag}-SHADED.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/%{name}-utils.jar
+install -D utils/target/cloud-utils-%{_maventag}-bundled.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/%{name}-utils.jar
install -D packaging/centos8/cloud-ipallocator.rc
${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator
install -D packaging/centos8/cloud.limits
${RPM_BUILD_ROOT}%{_sysconfdir}/security/limits.d/cloud
diff --git a/utils/pom.xml b/utils/pom.xml
index c65de9cb901..39ab96b8bef 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -261,7 +261,7 @@
<goal>shade</goal>
</goals>
<configuration>
-
<finalName>${project.artifactId}-${project.version}-SHADED</finalName>
+
<finalName>${project.artifactId}-${project.version}-bundled</finalName>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
