upstream: b=main,r=9d0aede896ba98a01623f35a0138e867d9f44773,t=2024-06…

…-14-1243-35893

.mvn/maven-build-cache-config.xml

@@ -26,8 +26,11 @@
     <input>
         <global>
             <glob>
-                {*.lock}
+                {*.lock,*.js,*.jsx,*.scss,*.java,*.groovy,*.properties}
             </glob>
+            <includes>
+                <include>src/</include>
+            </includes>
         </global>
     </input>
 

assemblies/nexus-startup-feature/pom.xml

@@ -95,11 +95,6 @@
       <artifactId>jetty-util-ajax</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-proxy</artifactId>

buildsupport/jetty/pom.xml

@@ -100,12 +100,6 @@
         <version>${eclipse-jetty.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlets</artifactId>
-        <version>${eclipse-jetty.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-proxy</artifactId>

components/nexus-base/src/main/java/org/sonatype/nexus/node/datastore/NodeHeartbeat.java

@@ -0,0 +1,64 @@
+/*
+ * Sonatype Nexus (TM) Open Source Version
+ * Copyright (c) 2008-present Sonatype, Inc.
+ * All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ * which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ * of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ * Eclipse Foundation. All other trademarks are the property of their respective owners.
+ */
+package org.sonatype.nexus.node.datastore;
+
+import java.time.OffsetDateTime;
+import java.util.Map;
+
+import org.sonatype.nexus.common.entity.ContinuationAware;
+
+/**
+ * Heartbeat of a node pinging the database indicating its presence.
+ *
+ * @since 3.37
+ */
+public interface NodeHeartbeat
+    extends ContinuationAware
+{
+  /**
+   * The time of the last heartbeat
+   */
+  OffsetDateTime heartbeatTime();
+
+  /**
+   * Host name derived for the local system
+   */
+  String hostname();
+
+  /**
+   * The database record ID
+   */
+  Integer id();
+
+  Map<String, Object> nodeInfo();
+
+  Map<String, Object> systemInfo();
+
+  /**
+   * The Heartbeat ID of the node, this is a non-persistent value that is distinct from the NodeAccess ID. Only useful to
+   * determine whether the heartbeat was created while an instance is running.
+   */
+  String heartbeatId();
+
+  void setHeartbeatTime(final OffsetDateTime heartbeatTime);
+
+  void setHostname(final String hostname);
+
+  void setId(final Integer id);
+
+  void setHeartbeatId(final String heartbeatId);
+
+  void setNodeInfo(final Map<String, Object> nodeInfo);
+
+  void setSystemInfo(final Map<String, Object> systemInfo);
+}

components/nexus-base/src/main/java/org/sonatype/nexus/node/datastore/NodeHeartbeatManager.java

@@ -12,6 +12,7 @@
  */
 package org.sonatype.nexus.node.datastore;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -47,8 +48,18 @@ 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();
 }

components/nexus-blobstore-file/src/main/java/org/sonatype/nexus/blobstore/file/internal/FileBlobStoreDescriptor.java

@@ -31,6 +31,7 @@
 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;
@@ -48,6 +49,7 @@
  *
  * @since 3.6
  */
+@AvailabilityVersion(from = "1.0")
 @Named(FileBlobStore.TYPE)
 public class FileBlobStoreDescriptor
     extends BlobStoreDescriptorSupport

components/nexus-blobstore/pom.xml

@@ -37,7 +37,6 @@
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-blobstore-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-thread</artifactId>

components/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/BlobStoreDescriptor.java

@@ -22,6 +22,7 @@
 
 /**
  * Describes a blob store.
+ * Note: Do not inject Map<String, BlobStoreDescriptors> and instead opt to use BlobStoreDescriptorProvider
  *
  * @since 3.6
  */

components/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/BlobStoreDescriptorProvider.java

@@ -0,0 +1,46 @@
+/*
+ * Sonatype Nexus (TM) Open Source Version
+ * Copyright (c) 2008-present Sonatype, Inc.
+ * All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ * which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ * of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ * Eclipse Foundation. All other trademarks are the property of their respective owners.
+ */
+package org.sonatype.nexus.blobstore;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.sonatype.nexus.common.db.DatabaseCheck;
+
+@Named
+@Singleton
+public class BlobStoreDescriptorProvider
+{
+  private final Map<String, BlobStoreDescriptor> blobStoreDescriptors;
+
+  private final DatabaseCheck databaseCheck;
+
+  @Inject
+  public BlobStoreDescriptorProvider(
+      final DatabaseCheck databaseCheck,
+      final Map<String, BlobStoreDescriptor> blobStoreDescriptors)
+  {
+    this.databaseCheck = databaseCheck;
+    this.blobStoreDescriptors = blobStoreDescriptors;
+  }
+
+  public Map<String, BlobStoreDescriptor> get() {
+    return blobStoreDescriptors.entrySet().stream()
+        .filter(item -> databaseCheck.isAllowedByVersion(item.getValue().getClass()))
+        .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+  }
+}

components/nexus-blobstore/src/main/java/org/sonatype/nexus/blobstore/group/internal/BlobStoreGroupDescriptor.java

@@ -33,6 +33,7 @@
 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;
@@ -57,6 +58,7 @@
  *
  * @since 3.14
  */
+@AvailabilityVersion(from = "1.0")
 @Named(BlobStoreGroup.TYPE)
 public class BlobStoreGroupDescriptor
     extends BlobStoreDescriptorSupport

components/nexus-bootstrap/src/main/java/org/sonatype/nexus/bootstrap/osgi/NexusEditionPropertiesConfigurer.java

@@ -76,6 +76,11 @@ 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) {

components/nexus-capability/src/main/java/org/sonatype/nexus/capability/CapabilityDescriptor.java

@@ -21,6 +21,7 @@
 
 /**
  * Describes a capability (its type).
+ * Note: Do not inject List<BlobStoreDescriptors> and instead opt to use DefaultCapabilityDescriptorProvider
  */
 public interface CapabilityDescriptor
 {

components/nexus-capability/src/main/java/org/sonatype/nexus/capability/DefaultCapabilityDescriptorProvider.java

@@ -0,0 +1,46 @@
+/*
+ * Sonatype Nexus (TM) Open Source Version
+ * Copyright (c) 2008-present Sonatype, Inc.
+ * All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ * which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ * of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ * Eclipse Foundation. All other trademarks are the property of their respective owners.
+ */
+package org.sonatype.nexus.capability;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.sonatype.nexus.common.db.DatabaseCheck;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+@Named
+@Singleton
+public class DefaultCapabilityDescriptorProvider
+{
+  private final Map<String, CapabilityDescriptor> descriptors;
+
+  private final DatabaseCheck databaseCheck;
+
+  @Inject
+  public DefaultCapabilityDescriptorProvider(final Map<String, CapabilityDescriptor> descriptors,
+                                             final DatabaseCheck databaseCheck) {
+    this.descriptors = checkNotNull(descriptors);
+    this.databaseCheck = checkNotNull(databaseCheck);
+  }
+
+  public List<CapabilityDescriptor> get() {
+    return descriptors.values().stream()
+        .filter(capabilityDescriptor -> databaseCheck.isAllowedByVersion(capabilityDescriptor.getClass()))
+        .collect(Collectors.toList());
+  }
+}

components/nexus-cleanup-config/src/main/java/org/sonatype/nexus/cleanup/internal/task/CleanupTaskDescriptor.java

@@ -15,13 +15,15 @@
 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