Merge remote-tracking branch 'origin/foundation' into release-16.0.3

OpenNMS · Jul 27, 2015 · ca8ee08 · ca8ee08
2 parents 069f546 + b333828
commit ca8ee08
Show file tree

Hide file tree

Showing 49 changed files with 393 additions and 82 deletions.
diff --git a/bin/functions.pl b/bin/functions.pl
@@ -86,6 +86,18 @@
 $OOSNMP_TRUSTSTORE = File::Spec->catfile($PREFIX, 'bin', 'oosnmp.net.trustStore');
 if (not defined $MAVEN_OPTS or $MAVEN_OPTS eq '') {
 	$MAVEN_OPTS = "-Xmx1280m -XX:ReservedCodeCacheSize=512m -Djavax.net.ssl.trustStore=$OOSNMP_TRUSTSTORE -Djavax.net.ssl.trustStorePassword=password";
+
+	# The concurrent collector will throw an OutOfMemoryError if too much time is being spent in garbage collection: if
+	# more than 98% of the total time is spent in garbage collection and less than 2% of the heap is recovered, an
+	# OutOfMemoryError will be thrown. This feature is designed to prevent applications from running for an extended
+	# period of time while making little or no progress because the heap is too small. If necessary, this feature can
+	# be disabled by adding the option -XX:-UseGCOverheadLimit to the command line.
+	$MAVEN_OPTS .= " -XX:-UseGCOverheadLimit";
+
+	# If (a) peak application performance is the first priority and (b) there are no pause time requirements or pauses
+	# of one second or longer are acceptable, then select the parallel collector with -XX:+UseParallelGC and
+	# (optionally) enable parallel compaction with -XX:+UseParallelOldGC.
+	$MAVEN_OPTS .= " -XX:+UseParallelGC -XX:+UseParallelOldGC";
 }
 
 my $result = GetOptions(

diff --git a/container/pom.xml b/container/pom.xml
@@ -22,7 +22,7 @@
     <repository>
       <id>servicemix</id>
       <name>Apache ServiceMix Repository</name>
-      <url>http://maven.opennms.org/content/groups/servicemix-release/</url>
+      <url>http://maven.opennms.org/content/repositories/servicemix/</url>
       <releases><enabled>true</enabled></releases>
       <snapshots><enabled>false</enabled></snapshots>
     </repository>

diff --git a/core/upgrade/src/test/resources/etc/examples/jetty.xml b/core/upgrade/src/test/resources/etc/examples/jetty.xml
@@ -61,6 +61,8 @@
 						<Item>TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
 						<Item>TLS_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
 						<Item>TLS_RSA_WITH_DES_CBC_SHA</Item>
+						<Item>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+						<Item>TLS_DHE_RSA_WITH_AES_128_CBC_SHA</Item>
 					</Array>
 				</Set>
 			</New>

diff --git a/dependencies/castor/pom.xml b/dependencies/castor/pom.xml
@@ -58,15 +58,11 @@
   </dependencies>
   <pluginRepositories>
     <pluginRepository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
+      <snapshots><enabled>false</enabled></snapshots>
+      <releases><enabled>true</enabled></releases>
       <id>maven-repo</id>
       <name>Maven Central</name>
-      <url>http://maven.opennms.org/content/groups/maven.org-release2</url>
+      <url>http://maven.opennms.org/content/repositories/central/</url>
     </pluginRepository>
     <pluginRepository>
       <snapshots>
@@ -77,7 +73,7 @@
       </releases>
       <id>codehaus</id>
       <name>Maven/Codehaus Repository</name>
-      <url>http://maven.opennms.org/content/groups/codehaus.org-release</url>
+      <url>http://maven.opennms.org/content/repositories/codehaus/</url>
     </pluginRepository>
   </pluginRepositories>
 </project>
diff --git a/dependencies/dnsjava/pom.xml b/dependencies/dnsjava/pom.xml
@@ -27,16 +27,7 @@
       <releases><enabled>true</enabled></releases>
       <id>sonatype-public-repo</id>
       <name>Sonatype Public Maven Repository</name>
-      <url>http://maven.opennms.org/content/groups/sonatype.org-release</url>
+      <url>http://maven.opennms.org/content/repositories/sonatype-public-repo/</url>
     </repository>
-    <!--
-    <repository>
-      <snapshots><enabled>false</enabled><updatePolicy>${updatePolicy}</updatePolicy></snapshots>
-      <releases><enabled>true</enabled><updatePolicy>${updatePolicy}</updatePolicy></releases>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://maven.opennms.org/content/groups/java.net-release</url>
-    </repository>
-    -->
   </repositories>
 </project>
diff --git a/dependencies/jasper/pom.xml b/dependencies/jasper/pom.xml
@@ -101,5 +101,19 @@
       <name>OpenNMS Maven Repository</name>
       <url>http://maven.opennms.org/content/groups/opennms.org-release</url>
     </repository>
+    <repository>
+      <snapshots><enabled>false</enabled></snapshots>
+      <releases><enabled>true</enabled></releases>
+      <id>jasperreports</id>
+      <name>Jasper Reports Maven Repository</name>
+      <url>http://maven.opennms.org/content/repositories/jasperreports</url>
+    </repository>
+    <repository>
+      <snapshots><enabled>false</enabled></snapshots>
+      <releases><enabled>true</enabled></releases>
+      <id>jaspersoft-third-party</id>
+      <name>JasperSoft Third Party Maven Repository</name>
+      <url>http://maven.opennms.org/content/repositories/jaspersoft-third-party</url>
+    </repository>
   </repositories>
 </project>
diff --git a/dependencies/jersey/pom.xml b/dependencies/jersey/pom.xml
@@ -149,7 +149,7 @@
       <releases><enabled>true</enabled></releases>
       <id>maven2-repository.dev.java.net</id>
       <name>Java.net Repository for Maven</name>
-      <url>http://maven.opennms.org/content/groups/java.net-release</url>
+      <url>http://maven.opennms.org/content/repositories/maven2-repository.dev.java.net/</url>
     </repository>
   </repositories>
 </project>
diff --git a/dependencies/jfreechart/pom.xml b/dependencies/jfreechart/pom.xml
@@ -28,7 +28,7 @@
       <releases><enabled>true</enabled></releases>
       <id>jboss-repo</id>
       <name>JBoss Repository</name>
-      <url>http://maven.opennms.org/content/groups/jboss.com-release</url>
+      <url>http://maven.opennms.org/content/repositories/jboss-repo/</url>
     </repository>
   </repositories>
 </project>
diff --git a/dependencies/jradius/pom.xml b/dependencies/jradius/pom.xml
@@ -120,7 +120,7 @@
       <releases><enabled>true</enabled></releases>
       <id>coova</id>
       <name>Coova Repository</name>
-      <url>http://maven.opennms.org/content/groups/coova-release</url>
+      <url>http://maven.opennms.org/content/repositories/coova/</url>
     </repository>
   </repositories>
 </project>
diff --git a/dependencies/quartz/pom.xml b/dependencies/quartz/pom.xml
@@ -27,7 +27,7 @@
       <releases><enabled>true</enabled></releases>
       <id>jboss-repo</id>
       <name>JBoss Repository</name>
-      <url>http://maven.opennms.org/content/groups/jboss.com-release</url>
+      <url>http://maven.opennms.org/content/repositories/jboss-repo/</url>
     </repository>
   </repositories>
 </project>
diff --git a/dependencies/rancid/pom.xml b/dependencies/rancid/pom.xml
@@ -33,7 +33,7 @@
       <releases><enabled>true</enabled></releases>
       <id>sonatype-public-repo</id>
       <name>Sonatype Public Maven Repository</name>
-      <url>http://maven.opennms.org/content/groups/sonatype.org-release</url>
+      <url>http://maven.opennms.org/content/repositories/sonatype-public-repo/</url>
     </repository>
     <repository>
       <snapshots><enabled>false</enabled></snapshots>

diff --git a/dependencies/smslib/pom.xml b/dependencies/smslib/pom.xml
@@ -26,7 +26,7 @@
     <repository>
       <id>smslib-repo</id>
       <name>SMSLib Maven Repository</name>
-      <url>http://maven.opennms.org/content/groups/smslib.org-release</url>
+      <url>http://maven.opennms.org/content/repositories/smslib-repo/</url>
     </repository>
   </repositories>
 </project>
diff --git a/dependencies/spring-test/pom.xml b/dependencies/spring-test/pom.xml
@@ -35,9 +35,14 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>com.springsource.repository.bundles</id>
-      <name>SpringSource Enterprise Bundle Repository</name>
-      <url>http://maven.opennms.org/content/groups/springsource.com-release</url>
+      <id>com.springsource.repository.bundles.release</id>
+      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+      <url>http://maven.opennms.org/content/repositories/com.springsource.repository.bundles.release/</url>
+    </repository>
+    <repository>
+      <id>com.springsource.repository.bundles.external</id>
+      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+      <url>http://maven.opennms.org/content/repositories/com.springsource.repository.bundles.external/</url>
     </repository>
   </repositories>
 </project>
diff --git a/dependencies/spring-web/pom.xml b/dependencies/spring-web/pom.xml
@@ -167,9 +167,14 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>com.springsource.repository.bundles</id>
-      <name>SpringSource Enterprise Bundle Repository</name>
-      <url>http://maven.opennms.org/content/groups/springsource.com-release</url>
+      <id>com.springsource.repository.bundles.release</id>
+      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+      <url>http://maven.opennms.org/content/repositories/com.springsource.repository.bundles.release/</url>
+    </repository>
+    <repository>
+      <id>com.springsource.repository.bundles.external</id>
+      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+      <url>http://maven.opennms.org/content/repositories/com.springsource.repository.bundles.external/</url>
     </repository>
   </repositories>
 </project>
diff --git a/dependencies/spring/pom.xml b/dependencies/spring/pom.xml
@@ -150,9 +150,14 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>com.springsource.repository.bundles</id>
-      <name>SpringSource Enterprise Bundle Repository</name>
-      <url>http://maven.opennms.org/content/groups/springsource.com-release</url>
+      <id>com.springsource.repository.bundles.release</id>
+      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+      <url>http://maven.opennms.org/content/repositories/com.springsource.repository.bundles.release/</url>
+    </repository>
+    <repository>
+      <id>com.springsource.repository.bundles.external</id>
+      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+      <url>http://maven.opennms.org/content/repositories/com.springsource.repository.bundles.external/</url>
     </repository>
   </repositories>
 </project>
diff --git a/features/jmx-config-generator-webui/pom.xml b/features/jmx-config-generator-webui/pom.xml
@@ -194,11 +194,11 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
         <repository>
             <id>vaadin-addons</id>
-            <url>http://maven.opennms.org/content/groups/vaadin.com-addons/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-addons/</url>
         </repository>
     </repositories>
 
@@ -207,13 +207,13 @@
             <id>codehaus-snapshots</id>
             <snapshots><enabled>true</enabled></snapshots>
             <releases><enabled>false</enabled></releases>
-            <url>http://maven.opennms.org/content/groups/codehaus.org-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/codehaus-snapshots/</url>
         </pluginRepository>
         <pluginRepository>
             <id>vaadin-snapshots</id>
             <snapshots><enabled>true</enabled></snapshots>
             <releases><enabled>false</enabled></releases>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </pluginRepository>
     </pluginRepositories>
 

diff --git a/features/reporting/jasper-reports/pom.xml b/features/reporting/jasper-reports/pom.xml
@@ -98,6 +98,13 @@
   </dependencies>
 
   <repositories>
+    <repository>
+      <snapshots><enabled>false</enabled></snapshots>
+      <releases><enabled>true</enabled></releases>
+      <id>jasperreports</id>
+      <name>Jasper Reports Maven Repository</name>
+      <url>http://maven.opennms.org/content/repositories/jasperreports/</url>
+    </repository>
     <repository>
       <snapshots><enabled>false</enabled></snapshots>
       <releases><enabled>true</enabled></releases>

diff --git a/features/ticketing/jira-integration/pom.xml b/features/ticketing/jira-integration/pom.xml
@@ -14,7 +14,7 @@
         <repository>
             <id>atlassian-public</id>
             <name>Atlassian public repo</name>
-            <url>http://maven.opennms.org/content/groups/atlassian.com-release/</url>
+            <url>http://maven.opennms.org/content/repositories/atlassian-public/</url>
         </repository>
     </repositories>
 

diff --git a/features/topology-map/features/vaadin/pom.xml b/features/topology-map/features/vaadin/pom.xml
@@ -115,7 +115,7 @@
   <repositories>
     <repository>
        <id>vaadin-addons</id>
-       <url>http://maven.opennms.org/content/groups/vaadin.com-addons/</url>
+       <url>http://maven.opennms.org/content/repositories/vaadin-addons/</url>
     </repository>
     <repository>
       <snapshots><enabled>false</enabled></snapshots>

diff --git a/features/topology-map/poms/pom.xml b/features/topology-map/poms/pom.xml
@@ -88,7 +88,7 @@
     <repository>
       <id>servicemix</id>
       <name>Apache ServiceMix Repository</name>
-      <url>http://maven.opennms.org/content/groups/servicemix-release/</url>
+      <url>http://maven.opennms.org/content/repositories/servicemix/</url>
       <releases><enabled>true</enabled></releases>
       <snapshots><enabled>false</enabled></snapshots>
     </repository>
@@ -106,7 +106,7 @@
     <pluginRepository>
       <id>servicemix</id>
       <name>Apache ServiceMix Repository</name>
-      <url>http://maven.opennms.org/content/groups/servicemix-release/</url>
+      <url>http://maven.opennms.org/content/repositories/servicemix/</url>
       <releases><enabled>true</enabled></releases>
       <snapshots><enabled>false</enabled></snapshots>
     </pluginRepository>

diff --git a/features/vaadin-dashboard/pom.xml b/features/vaadin-dashboard/pom.xml
@@ -125,7 +125,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
         <repository>
             <id>vaadin-addons</id>
@@ -138,13 +138,13 @@
             <id>codehaus-snapshots</id>
             <snapshots><enabled>true</enabled></snapshots>
             <releases><enabled>false</enabled></releases>
-            <url>http://maven.opennms.org/content/groups/codehaus.org-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/codehaus-snapshots/</url>
         </pluginRepository>
         <pluginRepository>
             <id>vaadin-snapshots</id>
             <snapshots><enabled>true</enabled></snapshots>
             <releases><enabled>false</enabled></releases>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </pluginRepository>
     </pluginRepositories>
 

diff --git a/features/vaadin-dashlets/dashlet-alarms/pom.xml b/features/vaadin-dashlets/dashlet-alarms/pom.xml
@@ -26,7 +26,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
     </repositories>
 

diff --git a/features/vaadin-dashlets/dashlet-charts/pom.xml b/features/vaadin-dashlets/dashlet-charts/pom.xml
@@ -27,7 +27,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshost/</url>
         </repository>
     </repositories>
 

diff --git a/features/vaadin-dashlets/dashlet-image/pom.xml b/features/vaadin-dashlets/dashlet-image/pom.xml
@@ -27,7 +27,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
     </repositories>
 

diff --git a/features/vaadin-dashlets/dashlet-ksc/pom.xml b/features/vaadin-dashlets/dashlet-ksc/pom.xml
@@ -27,7 +27,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
     </repositories>
 

diff --git a/features/vaadin-dashlets/dashlet-map/pom.xml b/features/vaadin-dashlets/dashlet-map/pom.xml
@@ -27,7 +27,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
     </repositories>
 

diff --git a/features/vaadin-dashlets/dashlet-rrd/pom.xml b/features/vaadin-dashlets/dashlet-rrd/pom.xml
@@ -27,7 +27,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
     </repositories>
 

diff --git a/features/vaadin-dashlets/dashlet-rtc/pom.xml b/features/vaadin-dashlets/dashlet-rtc/pom.xml
@@ -27,7 +27,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
     </repositories>
 

diff --git a/features/vaadin-dashlets/dashlet-summary/pom.xml b/features/vaadin-dashlets/dashlet-summary/pom.xml
@@ -26,7 +26,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
     </repositories>
 

diff --git a/features/vaadin-dashlets/dashlet-surveillance/pom.xml b/features/vaadin-dashlets/dashlet-surveillance/pom.xml
@@ -27,7 +27,7 @@
             <id>vaadin-snapshots</id>
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>
-            <url>http://maven.opennms.org/content/groups/vaadin-snapshot/</url>
+            <url>http://maven.opennms.org/content/repositories/vaadin-snapshots/</url>
         </repository>
     </repositories>