This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 7186f3d8ff Fixes to juneau-distrib
new 36f5599650 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/juneau
7186f3d8ff is described below
commit 7186f3d8ff8a583e632ad1268ed97d49f3a44fa6
Author: James Bognar <[email protected]>
AuthorDate: Tue Dec 30 12:25:13 2025 -0500
Fixes to juneau-distrib
---
juneau-distrib/pom.xml | 216 +++++++++++++++++++++++++++++++++++++++++++++++--
pom.xml | 3 +
scripts/release.py | 4 +-
3 files changed, 216 insertions(+), 7 deletions(-)
diff --git a/juneau-distrib/pom.xml b/juneau-distrib/pom.xml
index af8a77c49c..950854dba9 100644
--- a/juneau-distrib/pom.xml
+++ b/juneau-distrib/pom.xml
@@ -52,30 +52,110 @@
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-shaded-core</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-shaded-core-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/shaded</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-shaded-rest-client</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-shaded-rest-client-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/shaded</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-shaded-rest-server</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-shaded-rest-server-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/shaded</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-shaded-rest-server-springboot</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-shaded-rest-server-springboot-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/shaded</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-shaded-all</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-shaded-all-${project.version}.jar</destFileName>
+ </artifactItem>
+
+ <!--
juneau-commons -->
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-commons</artifactId>
+
<version>${project.version}</version>
+
<type>jar</type>
+
<classifier>sources</classifier>
+
<destFileName>apache-juneau-commons-${project.version}-sources.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-commons</artifactId>
+
<version>${project.version}</version>
+
<destFileName>apache-juneau-commons-${project.version}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-commons</artifactId>
+
<version>${project.version}</version>
+
<destFileName>org.apache.juneau.commons_${project.version}.jar</destFileName>
+ </artifactItem>
+
+ <!--
juneau-assertions -->
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-assertions</artifactId>
+
<version>${project.version}</version>
+
<type>jar</type>
+
<classifier>sources</classifier>
+
<destFileName>apache-juneau-assertions-${project.version}-sources.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-assertions</artifactId>
+
<version>${project.version}</version>
+
<destFileName>apache-juneau-assertions-${project.version}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-assertions</artifactId>
+
<version>${project.version}</version>
+
<destFileName>org.apache.juneau.assertions_${project.version}.jar</destFileName>
+ </artifactItem>
+
+ <!-- juneau-bct
-->
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-bct</artifactId>
+
<version>${project.version}</version>
+
<type>jar</type>
+
<classifier>sources</classifier>
+
<destFileName>apache-juneau-bct-${project.version}-sources.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-bct</artifactId>
+
<version>${project.version}</version>
+
<destFileName>apache-juneau-bct-${project.version}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-bct</artifactId>
+
<version>${project.version}</version>
+
<destFileName>org.apache.juneau.bct_${project.version}.jar</destFileName>
</artifactItem>
<!--
juneau-marshall -->
@@ -86,12 +166,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-marshall-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-marshall-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -109,12 +191,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-config-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-config</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-config-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -132,12 +216,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-bean-atom-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-bean-atom</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-bean-atom-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -155,12 +241,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-bean-common-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-bean-common</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-bean-common-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -178,12 +266,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-bean-html5-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-bean-html5</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-bean-html5-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -201,12 +291,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-bean-jsonschema-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-bean-jsonschema</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-bean-jsonschema-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -224,12 +316,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-bean-openapi-v3-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-bean-openapi-v3</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-bean-openapi-v3-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -239,6 +333,56 @@
<destFileName>org.apache.juneau.bean.openapi.v3_${project.version}.jar</destFileName>
</artifactItem>
+ <!--
juneau-bean-swagger-v2 -->
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-bean-swagger-v2</artifactId>
+
<version>${project.version}</version>
+
<type>jar</type>
+
<classifier>sources</classifier>
+
<destFileName>apache-juneau-bean-swagger-v2-${project.version}-sources.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-bean-swagger-v2</artifactId>
+
<version>${project.version}</version>
+
<destFileName>apache-juneau-bean-swagger-v2-${project.version}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-bean-swagger-v2</artifactId>
+
<version>${project.version}</version>
+
<destFileName>org.apache.juneau.bean.swagger.v2_${project.version}.jar</destFileName>
+ </artifactItem>
+
+ <!--
juneau-rest-common -->
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-rest-common</artifactId>
+
<version>${project.version}</version>
+
<type>jar</type>
+
<classifier>sources</classifier>
+
<destFileName>apache-juneau-rest-common-${project.version}-sources.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-rest-common</artifactId>
+
<version>${project.version}</version>
+
<destFileName>apache-juneau-rest-common-${project.version}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-rest-common</artifactId>
+
<version>${project.version}</version>
+
<destFileName>org.apache.juneau.rest.common_${project.version}.jar</destFileName>
+ </artifactItem>
+
<!--
juneau-rest-server -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
@@ -247,12 +391,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-rest-server-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-rest-server-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -270,12 +416,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-rest-server-springboot-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-server-springboot</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-rest-server-springboot-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -293,12 +441,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-rest-client-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-client</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-rest-client-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -316,12 +466,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-rest-mock-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-mock</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-rest-mock-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -339,12 +491,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-microservice-core-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-microservice-core</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-microservice-core-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -362,12 +516,14 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
+
<destFileName>apache-juneau-microservice-jetty-${project.version}-sources.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-microservice-jetty</artifactId>
<version>${project.version}</version>
+
<destFileName>apache-juneau-microservice-jetty-${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
@@ -377,6 +533,56 @@
<destFileName>org.apache.juneau.microservice.jetty_${project.version}.jar</destFileName>
</artifactItem>
+ <!--
juneau-sc-client -->
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-sc-client</artifactId>
+
<version>${project.version}</version>
+
<type>jar</type>
+
<classifier>sources</classifier>
+
<destFileName>apache-juneau-sc-client-${project.version}-sources.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-sc-client</artifactId>
+
<version>${project.version}</version>
+
<destFileName>apache-juneau-sc-client-${project.version}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-sc-client</artifactId>
+
<version>${project.version}</version>
+
<destFileName>org.apache.juneau.sc.client_${project.version}.jar</destFileName>
+ </artifactItem>
+
+ <!--
juneau-sc-server -->
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-sc-server</artifactId>
+
<version>${project.version}</version>
+
<type>jar</type>
+
<classifier>sources</classifier>
+
<destFileName>apache-juneau-sc-server-${project.version}-sources.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-sc-server</artifactId>
+
<version>${project.version}</version>
+
<destFileName>apache-juneau-sc-server-${project.version}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+
<groupId>org.apache.juneau</groupId>
+
<artifactId>juneau-sc-server</artifactId>
+
<version>${project.version}</version>
+
<destFileName>org.apache.juneau.sc.server_${project.version}.jar</destFileName>
+ </artifactItem>
+
<!--
juneau-examples-core -->
<artifactItem>
<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
@@ -385,7 +591,7 @@
<classifier>bin</classifier>
<type>zip</type>
<version>${project.version}</version>
-
<destFileName>juneau-examples-core-${project.version}.zip</destFileName>
+
<destFileName>apache-juneau-examples-core-${project.version}.zip</destFileName>
</artifactItem>
<!--
juneau-examples-rest-jetty -->
@@ -396,7 +602,7 @@
<classifier>bin</classifier>
<type>zip</type>
<version>${project.version}</version>
-
<destFileName>juneau-examples-rest-jetty-${project.version}.zip</destFileName>
+
<destFileName>apache-juneau-examples-rest-jetty-${project.version}.zip</destFileName>
</artifactItem>
<!--
juneau-examples-springboot -->
@@ -407,7 +613,7 @@
<classifier>bin</classifier>
<type>zip</type>
<version>${project.version}</version>
-
<destFileName>juneau-examples-rest-springboot-${project.version}.zip</destFileName>
+
<destFileName>apache-juneau-examples-rest-springboot-${project.version}.zip</destFileName>
</artifactItem>
<!--
juneau-my-jetty-microservice -->
@@ -418,7 +624,7 @@
<classifier>bin</classifier>
<type>zip</type>
<version>${project.version}</version>
-
<destFileName>my-jetty-microservice-${project.version}.zip</destFileName>
+
<destFileName>apache-juneau-my-jetty-microservice-${project.version}.zip</destFileName>
</artifactItem>
<!--
juneau-my-springboot-microservice -->
@@ -429,7 +635,7 @@
<classifier>bin</classifier>
<type>zip</type>
<version>${project.version}</version>
-
<destFileName>my-springboot-microservice-${project.version}.zip</destFileName>
+
<destFileName>apache-juneau-my-springboot-microservice-${project.version}.zip</destFileName>
</artifactItem>
</artifactItems>
diff --git a/pom.xml b/pom.xml
index 30d66111a7..54e778c8a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,9 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
+ <!-- Configure checksum algorithms: only SHA-512 (disable MD5
and SHA-1) -->
+
<aether.checksums.algorithms>SHA-512</aether.checksums.algorithms>
+
<juneau.compare.version>9.0.1</juneau.compare.version>
<junit.version>5.13.4</junit.version>
<javadoc.plugin.version>3.11.3</javadoc.plugin.version>
diff --git a/scripts/release.py b/scripts/release.py
index 7c56eb5390..1ae48e82f4 100755
--- a/scripts/release.py
+++ b/scripts/release.py
@@ -712,7 +712,7 @@ class ReleaseScript:
staging = Path(os.environ.get('X_STAGING',
'~/tmp/dist-release-juneau')).expanduser()
juneau_dir = staging / 'git' / 'juneau'
- self.run_command(['mvn', 'deploy'], cwd=juneau_dir)
+ self.run_command(['mvn', 'deploy',
'-Daether.checksums.algorithms=SHA-512'], cwd=juneau_dir)
self.end_timer()
self.state.set_last_step('run_deploy')
@@ -761,7 +761,7 @@ class ReleaseScript:
staging = Path(os.environ.get('X_STAGING',
'~/tmp/dist-release-juneau')).expanduser()
juneau_dir = staging / 'git' / 'juneau'
- self.run_command(['mvn', 'release:perform'], cwd=juneau_dir)
+ self.run_command(['mvn', 'release:perform',
'-Daether.checksums.algorithms=SHA-512'], cwd=juneau_dir)
# Open Nexus staging repositories page
subprocess.Popen(['open',
'https://repository.apache.org/#stagingRepositories'])
