upstream: b=main,r=df981a24afa262d2641d11c9f3714d9dfe8feaa1,t=2024-05…

…-24-1839-15178
sonatype · May 24, 2024 · 48fab47 · 48fab47
1 parent 752be39
commit 48fab47
Show file tree

Hide file tree

Showing 333 changed files with 5,856 additions and 1,003 deletions.
diff --git a/assemblies/nexus-base-feature/pom.xml b/assemblies/nexus-base-feature/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.sonatype.nexus.assemblies</groupId>
     <artifactId>nexus-assemblies</artifactId>
-    <version>3.69.0-SNAPSHOT</version>
+    <version>3.70.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-base-feature</artifactId>

diff --git a/assemblies/nexus-base-overlay/pom.xml b/assemblies/nexus-base-overlay/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.sonatype.nexus.assemblies</groupId>
     <artifactId>nexus-assemblies</artifactId>
-    <version>3.69.0-SNAPSHOT</version>
+    <version>3.70.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-base-overlay</artifactId>

diff --git a/assemblies/nexus-base-overlay/src/main/resources/overlay/etc/jetty/jetty.xml b/assemblies/nexus-base-overlay/src/main/resources/overlay/etc/jetty/jetty.xml
@@ -12,7 +12,6 @@
     <Arg>
       <New id="NexusWebAppContext" class="org.eclipse.jetty.webapp.WebAppContext">
         <Set name="descriptor"><Property name="jetty.etc"/>/nexus-web.xml</Set>
-        <Set name="resourceBase"><Property name="karaf.base"/>/public</Set>
         <Set name="contextPath"><Property name="nexus-context-path"/></Set>
         <Set name="throwUnavailableOnStartupException">true</Set>
         <Set name="configurationClasses">

diff --git a/assemblies/nexus-base-overlay/src/main/resources/overlay/etc/karaf/config.properties b/assemblies/nexus-base-overlay/src/main/resources/overlay/etc/karaf/config.properties
@@ -84,31 +84,31 @@ org.osgi.framework.system.packages.extra = \
     javax.xml.bind.util;version=2.3.3, \
     javax.xml.soap;version=1.3, \
     javax.xml.parsers, \
-    org.bouncycastle.asn1;version=1.75, \
-    org.bouncycastle.asn1.ocsp;version=1.75, \
-    org.bouncycastle.asn1.oiw;version=1.75, \
-    org.bouncycastle.asn1.x500;version=1.75, \
-    org.bouncycastle.asn1.x509;version=1.75, \
-    org.bouncycastle.bcpg;version=1.75, \
-    org.bouncycastle.cert;version=1.75, \
-    org.bouncycastle.cert.jcajce;version=1.75, \
-    org.bouncycastle.cert.ocsp;version=1.75, \
-    org.bouncycastle.cert.ocsp.jcajce;version=1.75, \
-    org.bouncycastle.crypto.params;version=1.75, \
-    org.bouncycastle.crypto.prng;version=1.75, \
-    org.bouncycastle.crypto.util;version=1.75, \
-    org.bouncycastle.jce.provider;version=1.75, \
-    org.bouncycastle.openssl;version=1.75, \
-    org.bouncycastle.openssl.jcajce;version=1.75, \
-    org.bouncycastle.openpgp;version=1.75, \
-    org.bouncycastle.openpgp.operator;version=1.75, \
-    org.bouncycastle.openpgp.operator.jcajce;version=1.75, \
-    org.bouncycastle.operator;version=1.75, \
-    org.bouncycastle.operator.bc;version=1.75, \
-    org.bouncycastle.operator.jcajce;version=1.75, \
-    org.bouncycastle.util.encoders;version=1.75, \
-    org.bouncycastle.util.io;version=1.75, \
-    org.bouncycastle.x509;version=1.75, \
+    org.bouncycastle.asn1;version=1.78.1, \
+    org.bouncycastle.asn1.ocsp;version=1.78.1, \
+    org.bouncycastle.asn1.oiw;version=1.78.1, \
+    org.bouncycastle.asn1.x500;version=1.78.1, \
+    org.bouncycastle.asn1.x509;version=1.78.1, \
+    org.bouncycastle.bcpg;version=1.78.1, \
+    org.bouncycastle.cert;version=1.78.1, \
+    org.bouncycastle.cert.jcajce;version=1.78.1, \
+    org.bouncycastle.cert.ocsp;version=1.78.1, \
+    org.bouncycastle.cert.ocsp.jcajce;version=1.78.1, \
+    org.bouncycastle.crypto.params;version=1.78.1, \
+    org.bouncycastle.crypto.prng;version=1.78.1, \
+    org.bouncycastle.crypto.util;version=1.78.1, \
+    org.bouncycastle.jce.provider;version=1.78.1, \
+    org.bouncycastle.openssl;version=1.78.1, \
+    org.bouncycastle.openssl.jcajce;version=1.78.1, \
+    org.bouncycastle.openpgp;version=1.78.1, \
+    org.bouncycastle.openpgp.operator;version=1.78.1, \
+    org.bouncycastle.openpgp.operator.jcajce;version=1.78.1, \
+    org.bouncycastle.operator;version=1.78.1, \
+    org.bouncycastle.operator.bc;version=1.78.1, \
+    org.bouncycastle.operator.jcajce;version=1.78.1, \
+    org.bouncycastle.util.encoders;version=1.78.1, \
+    org.bouncycastle.util.io;version=1.78.1, \
+    org.bouncycastle.x509;version=1.78.1, \
     org.apache.karaf.branding, \
     org.xml.sax, \
     org.xml.sax.helpers, \

diff --git a/assemblies/nexus-base-overlay/src/main/resources/overlay/public/COPYRIGHT.html b/assemblies/nexus-base-overlay/src/main/resources/overlay/public/COPYRIGHT.html
diff --git a/assemblies/nexus-base-overlay/src/main/resources/overlay/public/OSS-LICENSE.html b/assemblies/nexus-base-overlay/src/main/resources/overlay/public/OSS-LICENSE.html
diff --git a/assemblies/nexus-base-template/pom.xml b/assemblies/nexus-base-template/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.sonatype.nexus.assemblies</groupId>
     <artifactId>nexus-assemblies</artifactId>
-    <version>3.69.0-SNAPSHOT</version>
+    <version>3.70.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-base-template</artifactId>

diff --git a/assemblies/nexus-boot-feature/pom.xml b/assemblies/nexus-boot-feature/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.sonatype.nexus.assemblies</groupId>
     <artifactId>nexus-assemblies</artifactId>
-    <version>3.69.0-SNAPSHOT</version>
+    <version>3.70.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-boot-feature</artifactId>