upstream: b=main,r=c8a3e4cc117ccfab5a6e16dceb19f69c64ce90f1,t=2024-11…

…-22-1342-38744
afrimberger · Nov 22, 2024 · fc7a257 · fc7a257
1 parent aeac8dd
commit fc7a257
Show file tree

Hide file tree

Showing 305 changed files with 2,862 additions and 1,605 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.75.0-SNAPSHOT</version>
+    <version>3.76.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.75.0-SNAPSHOT</version>
+    <version>3.76.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-base-overlay</artifactId>

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.75.0-SNAPSHOT</version>
+    <version>3.76.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.75.0-SNAPSHOT</version>
+    <version>3.76.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-boot-feature</artifactId>

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

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

diff --git a/assemblies/pom.xml b/assemblies/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.sonatype.nexus</groupId>
     <artifactId>nexus-parent</artifactId>
-    <version>3.75.0-SNAPSHOT</version>
+    <version>3.76.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.sonatype.nexus.assemblies</groupId>
@@ -46,15 +46,15 @@
         <groupId>org.sonatype.nexus</groupId>
         <artifactId>nexus-components</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.plugins</groupId>
         <artifactId>nexus-plugins</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 

diff --git a/buildsupport/all/pom.xml b/buildsupport/all/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.sonatype.nexus.buildsupport</groupId>
     <artifactId>nexus-buildsupport</artifactId>
-    <version>3.75.0-SNAPSHOT</version>
+    <version>3.76.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-buildsupport-all</artifactId>
@@ -35,143 +35,143 @@
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-commons</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-db</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-goodies</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-groovy</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-guice</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-httpclient</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-internal</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-jetty</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-jruby</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-logging</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-maven</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-metrics</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-osgi</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-other</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-rest</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-security</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-testing</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-ui</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
     </dependencies>

diff --git a/buildsupport/commons/pom.xml b/buildsupport/commons/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.sonatype.nexus.buildsupport</groupId>
     <artifactId>nexus-buildsupport</artifactId>
-    <version>3.75.0-SNAPSHOT</version>
+    <version>3.76.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-buildsupport-commons</artifactId>

diff --git a/buildsupport/db/pom.xml b/buildsupport/db/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.sonatype.nexus.buildsupport</groupId>
     <artifactId>nexus-buildsupport</artifactId>
-    <version>3.75.0-SNAPSHOT</version>
+    <version>3.76.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nexus-buildsupport-db</artifactId>
@@ -47,7 +47,7 @@
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
-        <version>2.2.224</version>
+        <version>2.3.232</version>
       </dependency>
 
       <dependency>

diff --git a/buildsupport/extjs-maven-plugin/pom.xml b/buildsupport/extjs-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.sonatype.nexus.buildsupport</groupId>
     <artifactId>nexus-buildsupport</artifactId>
-    <version>3.75.0-SNAPSHOT</version>
+    <version>3.76.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>extjs-maven-plugin</artifactId>
@@ -37,7 +37,7 @@
         <groupId>org.sonatype.nexus.buildsupport</groupId>
         <artifactId>nexus-buildsupport-all</artifactId>
         <type>pom</type>
-        <version>3.75.0-SNAPSHOT</version>
+        <version>3.76.0-SNAPSHOT</version>
         <scope>import</scope>
       </dependency>
 

diff --git a/buildsupport/extjs-maven-plugin/src/main/java/org/sonatype/nexus/extjs/AggregateJsMojo.java b/buildsupport/extjs-maven-plugin/src/main/java/org/sonatype/nexus/extjs/AggregateJsMojo.java
@@ -33,11 +33,11 @@
  *
  * @since 3.0
  */
-@Mojo(name="aggregate-js", defaultPhase = PROCESS_RESOURCES)
+@Mojo(name = "aggregate-js", defaultPhase = PROCESS_RESOURCES)
 public class AggregateJsMojo
     extends AbstractMojo
 {
-  private static final String[] DEFAULT_INCLUDES = { "**/*.js" };
+  private static final String[] DEFAULT_INCLUDES = {"**/*.js"};
 
   @Parameter(required = true)
   private File sourceDirectory;
@@ -67,10 +67,10 @@ public class AggregateJsMojo
   private boolean omit;
 
   /**
-   * Omission flags.  When named flag is enabled, sections matching those omission tokens will be commented out.
+   * Omission flags. When named flag is enabled, sections matching those omission tokens will be commented out.
    */
   @Parameter
-  private Map<String,String> omitFlags;
+  private Map<String, String> omitFlags;
 
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException {

diff --git a/buildsupport/extjs-maven-plugin/src/main/java/org/sonatype/nexus/extjs/ClassDefScanner.java b/buildsupport/extjs-maven-plugin/src/main/java/org/sonatype/nexus/extjs/ClassDefScanner.java
@@ -373,7 +373,7 @@ else if (node instanceof StringLiteral) {
      */
     private String stringLiteral(final AstNode node) {
       checkState(node instanceof StringLiteral, node, "Expected string literal only");
-      //noinspection ConstantConditions
+      // noinspection ConstantConditions
       StringLiteral string = (StringLiteral) node;
       return string.getValue();
     }
@@ -383,7 +383,7 @@ private String stringLiteral(final AstNode node) {
      */
     private double numberLiteral(final AstNode node) {
       checkState(node instanceof NumberLiteral, node, "Expected number literal only");
-      //noinspection ConstantConditions
+      // noinspection ConstantConditions
       NumberLiteral number = (NumberLiteral) node;
       return number.getNumber();
     }
@@ -394,7 +394,7 @@ private double numberLiteral(final AstNode node) {
     private List<String> arrayStringLiteral(final AstNode node) {
       checkState(node instanceof ArrayLiteral, node, "Expected array literal only");
       List<String> result = new ArrayList<>();
-      //noinspection ConstantConditions
+      // noinspection ConstantConditions
       ArrayLiteral array = (ArrayLiteral) node;
       for (AstNode element : array.getElements()) {
         result.add(stringLiteral(element));