Release 2.15.0-04

sonatype · Mar 17, 2022 · 0516fd7 · 0516fd7
1 parent 45b0c37
commit 0516fd7
Show file tree

Hide file tree

Showing 706 changed files with 5,645 additions and 3,506 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,10 +1,13 @@
 Sonatype Nexus (TM) Open Source Version.
-Copyright (c) 2008-2015 Sonatype, Inc. All rights reserved.
+Copyright (c) 2008-present Sonatype, Inc. All rights reserved.
 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) Open Source Version is distributed with Sencha Ext JS pursuant to a FLOSS Exception agreed upon between Sonatype, Inc.
+and Sencha Inc. Sencha Ext JS is licensed under GPL v3 and cannot be redistributed as part of a closed source work.
+
 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.
diff --git a/assemblies/nexus-bundle-template/pom.xml b/assemblies/nexus-bundle-template/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.sonatype.nexus.assemblies</groupId>
     <artifactId>nexus-assemblies</artifactId>
-    <version>2.14.21-02</version>
+    <version>2.15.0-04</version>
   </parent>
 
   <artifactId>nexus-bundle-template</artifactId>
@@ -55,8 +55,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.servlet</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -133,13 +133,13 @@
     </dependency>
 
     <dependency>
-      <groupId>com.yammer.metrics</groupId>
-      <artifactId>metrics-jetty</artifactId>
+      <groupId>com.codahale.metrics</groupId>
+      <artifactId>metrics-jetty9</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>com.yammer.metrics</groupId>
+      <groupId>com.codahale.metrics</groupId>
       <artifactId>metrics-logback</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/assemblies/nexus-bundle-template/src/main/resources/content/NOTICE.txt b/assemblies/nexus-bundle-template/src/main/resources/content/NOTICE.txt
@@ -1,10 +1,13 @@
 Sonatype Nexus (TM) Open Source Version.
-Copyright (c) 2008-2015 Sonatype, Inc. All rights reserved.
+Copyright (c) 2008-present Sonatype, Inc. All rights reserved.
 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) Open Source Version is distributed with Sencha Ext JS pursuant to a FLOSS Exception agreed upon between Sonatype, Inc.
+and Sencha Inc. Sencha Ext JS is licensed under GPL v3 and cannot be redistributed as part of a closed source work.
+
 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.
diff --git a/assemblies/nexus-bundle-template/src/main/resources/content/bin/jsw/conf/wrapper.conf b/assemblies/nexus-bundle-template/src/main/resources/content/bin/jsw/conf/wrapper.conf
@@ -30,14 +30,16 @@ wrapper.java.additional.1=-Djava.io.tmpdir=./tmp
 wrapper.java.additional.2=-Djava.net.preferIPv4Stack=true
 wrapper.java.additional.3=-Dcom.sun.jndi.ldap.connect.pool.protocol="plain ssl"
 wrapper.java.additional.3.stripquotes=TRUE
-#wrapper.java.additional.4=-Xdebug
-#wrapper.java.additional.5=-Xnoagent
-#wrapper.java.additional.6=-Djava.compiler=NONE
-#wrapper.java.additional.7=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#wrapper.java.additional.8=-XX:+HeapDumpOnOutOfMemoryError
+wrapper.java.additional.4=-Djdk.tls.ephemeralDHKeySize=2048
+#wrapper.java.additional.5=-Xdebug
+#wrapper.java.additional.6=-Xnoagent
+#wrapper.java.additional.7=-Djava.compiler=NONE
+#wrapper.java.additional.8=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#wrapper.java.additional.9=-XX:+HeapDumpOnOutOfMemoryError
 
 wrapper.app.parameter.1=./conf/jetty.xml
 wrapper.app.parameter.2=./conf/jetty-requestlog.xml
+wrapper.app.parameter.3=./conf/jetty-http.xml
 
 # Size Java memory, in MB (-Xms)
 wrapper.java.initmemory=256

diff --git a/...es/nexus-bundle-template/src/main/resources/content/conf/jetty-http-redirect-to-https.xml b/...es/nexus-bundle-template/src/main/resources/content/conf/jetty-http-redirect-to-https.xml
diff --git a/assemblies/nexus-bundle-template/src/main/resources/content/conf/jetty-http.xml b/assemblies/nexus-bundle-template/src/main/resources/content/conf/jetty-http.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+
+    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.
+
+-->
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <Call name="addConnector">
+    <Arg>
+      <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server"/></Arg>
+        <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" default="-1"/></Arg>
+        <Arg name="selectors" type="int"><Property name="jetty.http.selectors" default="-1"/></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <!-- uncomment to support proxy protocol
+            <Item>
+              <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
+            </Item>-->
+            <Item>
+              <New class="org.sonatype.nexus.bootstrap.jetty.NexusInstrumentedConnectionFactory">
+                <Arg>
+                  <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                    <Arg name="config">
+                      <Ref refid="httpConfig"/>
+                    </Arg>
+                  </New>
+                </Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Set name="host"><Property name="application-host" /></Set>
+        <Set name="port"><Property name="application-port"/></Set>
+        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
+        <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" default="0"/></Set>
+        <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" default="0"/></Set>
+        <Call name="addBean">
+          <Arg>
+            <New class="org.eclipse.jetty.io.ConnectionStatistics"/>
+          </Arg>
+        </Call>
+      </New>
+    </Arg>
+  </Call>
+</Configure>
diff --git a/assemblies/nexus-bundle-template/src/main/resources/content/conf/jetty-https.xml b/assemblies/nexus-bundle-template/src/main/resources/content/conf/jetty-https.xml
@@ -13,41 +13,89 @@
     Eclipse Foundation. All other trademarks are the property of their respective owners.
 
 -->
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure a secure HTTPS connector                              -->
-<!-- =============================================================== -->
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
+  <!-- =============================================================== -->
+  <!-- Configure a secure HTTPS connector                              -->
+  <!-- =============================================================== -->
+
   <!--
   ==== HTTPS ====
   Set the following inside nexus.properties:
   application-port-ssl: the port to listen for https connections
   -->
-  <Call name="addConnector">
+  <Ref refid="httpConfig">
+    <Set name="secureScheme">https</Set>
+    <Set name="securePort"><Property name="application-port-ssl" /></Set>
+  </Ref>
+
+  <New id="httpsConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+    <Arg><Ref refid="httpConfig"/></Arg>
+    <Call name="addCustomizer">
+      <Arg>
+        <New id="secureRequestCustomizer" class="org.eclipse.jetty.server.SecureRequestCustomizer">
+          <!-- 7776000 seconds = 90 days -->
+          <Set name="stsMaxAge"><Property name="jetty.https.stsMaxAge" default="7776000"/></Set>
+          <Set name="stsIncludeSubDomains"><Property name="jetty.https.stsIncludeSubDomains" default="false"/></Set>
+          <Set name="sniHostCheck"><Property name="jetty.https.sniHostCheck" default="false"/></Set>
+        </New>
+      </Arg>
+    </Call>
+  </New>
+
+  <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
+    <Set name="KeyStorePath">./conf/ssl/keystore.jks</Set>
+    <Set name="KeyStorePassword">password</Set>
+    <Set name="KeyManagerPassword">password</Set>
+    <Set name="TrustStorePath">./conf/ssl/keystore.jks</Set>
+    <Set name="TrustStorePassword">password</Set>
+    <Set name="EndpointIdentificationAlgorithm"></Set>
+    <Set name="NeedClientAuth"><Property name="jetty.ssl.needClientAuth" default="false"/></Set>
+    <Set name="WantClientAuth"><Property name="jetty.ssl.wantClientAuth" default="false"/></Set>
+    <Set name="IncludeProtocols">
+      <Array type="java.lang.String">
+        <Item>TLSv1.2</Item>
+      </Array>
+    </Set>
+  </New>
+
+  <Call  name="addConnector">
     <Arg>
-      <New id="HTTPSConnector" class="org.sonatype.nexus.bootstrap.jetty.InstrumentedSslSelectChannelConnector">
-        <Arg>
-          <New class="org.eclipse.jetty.util.ssl.SslContextFactory">
-            <Set name="keyStore">./conf/ssl/keystore.jks</Set>
-            <Set name="trustStore">./conf/ssl/keystore.jks</Set>
-            <Set name="keyStorePassword">OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v</Set>
-            <Set name="keyManagerPassword">OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v</Set>
-            <Set name="trustStorePassword">OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v</Set>
-            <Set name="excludeProtocols">
-              <Array type="java.lang.String">
-                <Item>SSL</Item>
-                <Item>SSLv2</Item>
-                <Item>SSLv2Hello</Item>
-                <Item>SSLv3</Item>
-              </Array>
-            </Set>
-          </New>
+      <New id="httpsConnector" class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="acceptors" type="int"><Property name="jetty.https.acceptors" default="-1"/></Arg>
+        <Arg name="selectors" type="int"><Property name="jetty.https.selectors" default="-1"/></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.sonatype.nexus.bootstrap.jetty.NexusInstrumentedConnectionFactory">
+                <Arg>
+                  <New class="org.eclipse.jetty.server.SslConnectionFactory">
+                    <Arg name="next">http/1.1</Arg>
+                    <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
+                  </New>
+                </Arg>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config"><Ref refid="httpsConfig" /></Arg>
+              </New>
+            </Item>
+          </Array>
         </Arg>
-        <Set name="host"><Property name="application-host"/></Set>
-        <Set name="port"><Property name="application-port-ssl"/></Set>
-        <Set name="forwarded">true</Set>
+
+        <Set name="host"><Property name="application-host" /></Set>
+        <Set name="port"><Property name="application-port-ssl" /></Set>
+        <Set name="idleTimeout"><Property name="jetty.https.idleTimeout" default="30000"/></Set>
+        <Set name="acceptorPriorityDelta"><Property name="jetty.https.acceptorPriorityDelta" default="0"/></Set>
+        <Set name="acceptQueueSize"><Property name="jetty.https.acceptQueueSize" default="0"/></Set>
+        <Call name="addBean">
+          <Arg>
+            <New class="org.eclipse.jetty.io.ConnectionStatistics"/>
+          </Arg>
+        </Call>
       </New>
     </Arg>
   </Call>

diff --git a/assemblies/nexus-bundle-template/src/main/resources/content/conf/jetty-jmx.xml b/assemblies/nexus-bundle-template/src/main/resources/content/conf/jetty-jmx.xml
@@ -13,7 +13,7 @@
     Eclipse Foundation. All other trademarks are the property of their respective owners.
 
 -->
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- =============================================================== -->
 <!-- Expose JMX MBeans and access from a remote host                 -->
@@ -29,7 +29,7 @@
   -->
 
   <!-- explicitly setting rmi server hostname as IP address here can help avoid network routing issues -->
-  <!-- http://docs.oracle.com/javase/7/docs/technotes/guides/management/faq.html#linux1 -->
+  <!-- http://docs.oracle.com/javase/8/docs/technotes/guides/management/faq.html#linux1 -->
   <Call name="setProperty" class="java.lang.System">
     <Arg>java.rmi.server.hostname</Arg>
     <Arg>
@@ -39,7 +39,7 @@
 
   <!-- WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -->
   <!-- defaulting convenience over security; exposing JMX to any remote host without ssl or authentication -->
-  <!-- http://docs.oracle.com/javase/7/docs/technotes/guides/jmx/ -->
+  <!-- http://docs.oracle.com/javase/8/docs/technotes/guides/jmx/ -->
   <Call name="setProperty" class="java.lang.System">
     <Arg>com.sun.management.jmxremote.ssl</Arg>
     <Arg>
@@ -53,47 +53,6 @@
     </Arg>
   </Call>
 
-  <!-- =========================================================== -->
-  <!-- Initialize an mbean server                                  -->
-  <!-- =========================================================== -->
-  <Call id="MBeanServer" class="java.lang.management.ManagementFactory" name="getPlatformMBeanServer" />
-
-  <!-- =========================================================== -->
-  <!-- Initialize the Jetty MBean container                        -->
-  <!-- =========================================================== -->
-  <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
-    <Arg>
-      <Ref id="MBeanServer" />
-    </Arg>
-    <Call name="start"/>
-  </New>
-
-  <!-- Add to the Server to listen for object events -->
-  <Get id="Container" name="container">
-    <Call name="addEventListener">
-      <Arg>
-        <Ref id="MBeanContainer" />
-      </Arg>
-    </Call>
-  </Get>
-
-  <!-- Add to the Server as a managed lifecycle -->
-  <Call name="addBean">
-    <Arg>
-      <Ref id="MBeanContainer"/>
-    </Arg>
-    <Arg type="boolean">true</Arg>
-  </Call>
-
-  <!-- Logging is initialized prior to the MBeanContainer, so it is necessary to register the logger manually -->
-  <Ref id="MBeanContainer">
-    <Call name="addBean">
-      <Arg>
-        <New class="org.eclipse.jetty.util.log.Log"/>
-      </Arg>
-    </Call>
-  </Ref>
-
   <!-- create the RMIRegistry -->
   <Call name="createRegistry" class="java.rmi.registry.LocateRegistry">
     <Arg type="java.lang.Integer"><Property name="jmx-port" default="1099" /></Arg>
@@ -102,7 +61,7 @@
     </Call>
   </Call>
 
-  <!-- create the RMI connector -->
+  <!-- create a remote JMXConnectorServer -->
   <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
     <Arg>
       <New class="javax.management.remote.JMXServiceURL">