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 2e6100d85bb utils: build both SHADED and original jars (#7912)
2e6100d85bb is described below
commit 2e6100d85bb408bd1ccfa062cd10ca20b2db3383
Author: Wei Zhou <[email protected]>
AuthorDate: Fri Sep 1 18:44:34 2023 +0200
utils: build both SHADED and original jars (#7912)
---
debian/rules | 2 +-
packaging/centos7/cloud.spec | 2 +-
packaging/centos8/cloud.spec | 2 +-
utils/pom.xml | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index 16f10ad8047..2f160cc5c24 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).jar
$(DESTDIR)/usr/share/$(PACKAGE)-common/lib/$(PACKAGE)-utils.jar
+ install -D utils/target/cloud-utils-$(VERSION)-SHADED.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 9a1cf92ce89..e498fed25a1 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}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/%{name}-utils.jar
+install -D utils/target/cloud-utils-%{_maventag}-SHADED.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 8d567f217ce..57b16543ba8 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}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/%{name}-utils.jar
+install -D utils/target/cloud-utils-%{_maventag}-SHADED.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 4360e187f75..c65de9cb901 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -261,6 +261,7 @@
<goal>shade</goal>
</goals>
<configuration>
+
<finalName>${project.artifactId}-${project.version}-SHADED</finalName>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
