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

…-31-1243-23302
sonatype · May 31, 2024 · d96ad5b · d96ad5b
1 parent 48fab47
commit d96ad5b
Show file tree

Hide file tree

Showing 173 changed files with 807 additions and 4,030 deletions.
diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0 https://maven.apache.org/xsd/build-cache-config-1.0.0.xsd">
+    <configuration>
+        <enabled>true</enabled>
+        <hashAlgorithm>XX</hashAlgorithm>
+        <local>
+            <maxBuildsCached>10</maxBuildsCached>
+        </local>
+        <attachedOutputs>
+            <dirNames>
+                <dirName>classes</dirName>
+                <dirName>generated-sources</dirName>
+                <dirName>generated-resources</dirName>
+                <dirName>generated-test-sources</dirName>
+                <dirName>maven-archiver</dirName>
+                <dirName>sonatype-clm</dirName>
+                <dirName>test-classes</dirName>
+                <dirName>maven-status</dirName>
+                <dirName>webpack-modules</dirName>
+            </dirNames>
+        </attachedOutputs>
+    </configuration>
+
+    <input>
+        <global>
+            <glob>
+                {*.lock}
+            </glob>
+        </global>
+    </input>
+
+    <executionControl>
+      <!--
+        Make the build cache work better if you skip tests.
+        See https://maven.apache.org/extensions/maven-build-cache-extension/how-to.html#i-occasionally-cached-build-with-dskiptests-true-and-tests-do-no for details.
+      -->
+      <reconcile>
+          <plugins>
+              <plugin artifactId="maven-surefire-plugin" goal="test">
+                  <reconciles>
+                      <reconcile propertyName="skip" skipValue="true"/>
+                      <reconcile propertyName="skipExec" skipValue="true"/>
+                      <reconcile propertyName="skipTests" skipValue="true"/>
+                      <reconcile propertyName="testFailureIgnore" skipValue="true"/>
+                  </reconciles>
+              </plugin>
+              <plugin artifactId="maven-failsafe-plugin" goal="test">
+                  <reconciles>
+                      <reconcile propertyName="skip" skipValue="true"/>
+                      <reconcile propertyName="skipExec" skipValue="true"/>
+                      <reconcile propertyName="skipTests" skipValue="true"/>
+                      <reconcile propertyName="testFailureIgnore" skipValue="true"/>
+                  </reconciles>
+              </plugin>
+          </plugins>
+      </reconcile>
+    </executionControl>
+</cache>
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.1
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
diff --git a/buildsupport/commons/pom.xml b/buildsupport/commons/pom.xml
@@ -33,7 +33,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.13.0</version>
+        <version>2.15.1</version>
       </dependency>
 
       <dependency>
@@ -54,6 +54,12 @@
         <version>3.13.0</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>1.11.0</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-csv</artifactId>
@@ -105,7 +111,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.24.0</version>
+        <version>1.26.1</version>
       </dependency>
 
       <!-- commons-compress dependency for xz support -->

diff --git a/components/nexus-base/src/main/java/org/sonatype/nexus/node/datastore/NodeHeartbeat.java b/components/nexus-base/src/main/java/org/sonatype/nexus/node/datastore/NodeHeartbeat.java
diff --git a/...ents/nexus-base/src/main/java/org/sonatype/nexus/node/datastore/NodeHeartbeatManager.java b/...ents/nexus-base/src/main/java/org/sonatype/nexus/node/datastore/NodeHeartbeatManager.java
@@ -12,7 +12,6 @@
  */
 package org.sonatype.nexus.node.datastore;
 
-import java.util.Collection;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -48,18 +47,8 @@ public interface NodeHeartbeatManager
    */
   boolean isCurrentNodeClustered();
 
-  /**
-   * Triggers a write of the latest heartbeat information
-   */
-  void writeHeartbeat();
-
   /**
    * Collects and transforms system info from heartbeat table
    */
   Map<String, Map<String, Object>> getSystemInformationForNodes();
-
-  /**
-   * Collects nodeInfo from the heartbeat table
-   */
-  Collection<NodeHeartbeat> getActiveNodeHeartbeatData();
 }
diff --git a/...ile/src/main/java/org/sonatype/nexus/blobstore/file/internal/FileBlobStoreDescriptor.java b/...ile/src/main/java/org/sonatype/nexus/blobstore/file/internal/FileBlobStoreDescriptor.java
@@ -31,7 +31,6 @@
 import org.sonatype.nexus.blobstore.file.FileBlobStore;
 import org.sonatype.nexus.blobstore.quota.BlobStoreQuotaService;
 import org.sonatype.nexus.common.app.ApplicationDirectories;
-import org.sonatype.nexus.common.upgrade.AvailabilityVersion;
 import org.sonatype.nexus.formfields.FormField;
 import org.sonatype.nexus.formfields.StringTextFormField;
 import org.sonatype.nexus.rest.ValidationErrorsException;
@@ -49,7 +48,6 @@
  *
  * @since 3.6
  */
-@AvailabilityVersion(from = "1.0")
 @Named(FileBlobStore.TYPE)
 public class FileBlobStoreDescriptor
     extends BlobStoreDescriptorSupport

diff --git a/...n/java/org/sonatype/nexus/blobstore/file/upgrades/SoftDeletedBlobsMigrationStep_1_19.java b/...n/java/org/sonatype/nexus/blobstore/file/upgrades/SoftDeletedBlobsMigrationStep_1_19.java
@@ -38,7 +38,7 @@ public class SoftDeletedBlobsMigrationStep_1_19
 
   private static final String H2 = "" +
       "SELECT * " +
-      "FROM INFORMATION_SCHEMA.CONSTRAINTS " +
+      "FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS " +
       "WHERE TABLE_NAME = 'SOFT_DELETED_BLOBS' AND CONSTRAINT_NAME = 'PK_SOFT_DELETED_BLOBS_BLOB_ID'";
 
   private static final String PSQL = "" +

diff --git a/components/nexus-blobstore/pom.xml b/components/nexus-blobstore/pom.xml
@@ -37,6 +37,7 @@
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-blobstore-api</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-thread</artifactId>

diff --git a/...nents/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/BlobStoreDescriptor.java b/...nents/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/BlobStoreDescriptor.java
@@ -22,7 +22,6 @@
 
 /**
  * Describes a blob store.
- * Note: Do not inject Map<String, BlobStoreDescriptors> and instead opt to use BlobStoreDescriptorProvider
  *
  * @since 3.6
  */

diff --git a/...xus-blobstore/src/main/java/org/sonatype/nexus/blobstore/BlobStoreDescriptorProvider.java b/...xus-blobstore/src/main/java/org/sonatype/nexus/blobstore/BlobStoreDescriptorProvider.java
diff --git a/...e/src/main/java/org/sonatype/nexus/blobstore/group/internal/BlobStoreGroupDescriptor.java b/...e/src/main/java/org/sonatype/nexus/blobstore/group/internal/BlobStoreGroupDescriptor.java
@@ -33,7 +33,6 @@
 import org.sonatype.nexus.blobstore.group.BlobStoreGroupService;
 import org.sonatype.nexus.blobstore.group.FillPolicy;
 import org.sonatype.nexus.blobstore.quota.BlobStoreQuotaService;
-import org.sonatype.nexus.common.upgrade.AvailabilityVersion;
 import org.sonatype.nexus.formfields.ComboboxFormField;
 import org.sonatype.nexus.formfields.FormField;
 import org.sonatype.nexus.formfields.ItemselectFormField;
@@ -58,7 +57,6 @@
  *
  * @since 3.14
  */
-@AvailabilityVersion(from = "1.0")
 @Named(BlobStoreGroup.TYPE)
 public class BlobStoreGroupDescriptor
     extends BlobStoreDescriptorSupport

diff --git a/...rap/src/main/java/org/sonatype/nexus/bootstrap/osgi/NexusEditionPropertiesConfigurer.java b/...rap/src/main/java/org/sonatype/nexus/bootstrap/osgi/NexusEditionPropertiesConfigurer.java
@@ -76,11 +76,6 @@ private void readEnvironmentVariables(final Properties properties) {
       properties.setProperty(FIREWALL_QUARANTINE_FIX_ENABLED,
           Boolean.toString(parseBoolean(System.getenv("FIREWALL_QUARANTINE_FIX_ENABLED"))));
     }
-
-    if (properties.getProperty(ZERO_DOWNTIME_BASELINE_FAIL) == null) {
-      properties.setProperty(ZERO_DOWNTIME_BASELINE_FAIL,
-          Optional.ofNullable(System.getenv("NEXUS_ZDU_BASELINE_FAIL")).orElse("false"));
-    }
   }
 
   private void selectDatastoreFeature(final Properties properties) {

diff --git a/...ts/nexus-capability/src/main/java/org/sonatype/nexus/capability/CapabilityDescriptor.java b/...ts/nexus-capability/src/main/java/org/sonatype/nexus/capability/CapabilityDescriptor.java
@@ -21,7 +21,6 @@
 
 /**
  * Describes a capability (its type).
- * Note: Do not inject List<BlobStoreDescriptors> and instead opt to use DefaultCapabilityDescriptorProvider
  */
 public interface CapabilityDescriptor
 {

diff --git a/...lity/src/main/java/org/sonatype/nexus/capability/DefaultCapabilityDescriptorProvider.java b/...lity/src/main/java/org/sonatype/nexus/capability/DefaultCapabilityDescriptorProvider.java
diff --git a/...-config/src/main/java/org/sonatype/nexus/cleanup/internal/task/CleanupTaskDescriptor.java b/...-config/src/main/java/org/sonatype/nexus/cleanup/internal/task/CleanupTaskDescriptor.java
@@ -15,15 +15,13 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.sonatype.nexus.common.upgrade.AvailabilityVersion;
 import org.sonatype.nexus.scheduling.TaskDescriptorSupport;
 
 /**
  * Task descriptor for {@link CleanupTask}.
  *
  * @since 3.14
  */
-@AvailabilityVersion(from = "1.0")
 @Named
 @Singleton
 public class CleanupTaskDescriptor