Fixing Jersey (cherry-picked and squashed from 2.x):

stepanv · stepanv · commit c98eb6c2c334 · 2016-06-14T15:36:12.000+02:00
* Documentation module copyrights
 * Bundles example module copyrights
 * Fixed download script of jersey memleak plugin

Change-Id: Icba3a13d9e53440fc16170b5dc16a1822e6426ad
diff --git a/bundles/examples/src/main/assembly/examples-assembly.xml b/bundles/examples/src/main/assembly/examples-assembly.xml
@@ -2,7 +2,7 @@
 <!--
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/bundles/examples/src/main/assembly/gf-examples-assembly.xml b/bundles/examples/src/main/assembly/gf-examples-assembly.xml
@@ -2,7 +2,7 @@
 <!--
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/assembly/docbook.xml b/docs/src/main/assembly/docbook.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/async.xml b/docs/src/main/docbook/async.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/chunked.xsl b/docs/src/main/docbook/chunked.xsl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/client.xml b/docs/src/main/docbook/client.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/custom-di.xml b/docs/src/main/docbook/custom-di.xml
@@ -2,7 +2,7 @@
 <!--
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
 
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/customizations.xsl b/docs/src/main/docbook/customizations.xsl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/dependencies.xml b/docs/src/main/docbook/dependencies.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/filters.xml b/docs/src/main/docbook/filters.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/getting-started.xml b/docs/src/main/docbook/getting-started.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/highlight.xsl b/docs/src/main/docbook/highlight.xsl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/how-to-build.xml b/docs/src/main/docbook/how-to-build.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/logging.xml b/docs/src/main/docbook/logging.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><!--
+<?xml version="1.0"?>
+<!--
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
diff --git a/docs/src/main/docbook/migration.xml b/docs/src/main/docbook/migration.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0"?><!--
+<?xml version="1.0"?>
+<!--
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/spring.xml b/docs/src/main/docbook/spring.xml
@@ -2,7 +2,7 @@
 <!--
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
 
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common Development
diff --git a/docs/src/main/docbook/user-guide.xml b/docs/src/main/docbook/user-guide.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude
@@ -24,7 +24,9 @@
 .zip
 .dat
 .lua
-/docs/src/main/docbook/inc/*.src
+/docs/src/main/docbook/inc/modules_table_footer.src
+/docs/src/main/docbook/inc/modules_table_header.src
+/docs/src/main/docbook/inc/modules_table_row.src
 jaxb.index
 /MANIFEST.MF
 /META-INF/services/
@@ -65,4 +67,4 @@ build.readme
 /core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/TimeReservoir.java
 /core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/UniformTimeReservoir.java
 /core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/UniformTimeSnapshot.java
-/core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/UniformTimeValuesSnapshot.java
+/core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/UniformTimeValuesSnapshot.java
diff --git a/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/gf4/download.sh b/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/gf4/download.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -64,12 +64,13 @@ if [ "$DIST_DIR" = "" -o "$DIST_TGT_LOCATION" = "" -o "$DIST_URL" = "" ]; then
 fi
 
 if [ ! -f "$DIST_TGT_LOCATION" -o "$DOWNLOAD_IF_EXISTS" = "true" ]; then
-    curl -o "$DIST_TGT_LOCATION" "$DIST_URL"
+    mkdir -p "$(dirname "$DIST_TGT_LOCATION")"
+    curl -sS -o "$DIST_TGT_LOCATION" "$DIST_URL"
 fi
 
 if [ "$OVERWRITE" = "true" -o ! -d "$DIST_DIR"/"$DIST_SUBDIR" ]; then
     rm -rf "$DIST_DIR"/"$DIST_SUBDIR"
 
     unzip -o "$DIST_TGT_LOCATION" -d "$DIST_DIR"
     chmod -R 777 "$DIST_DIR"/"$DIST_SUBDIR"
-fi
+fi
diff --git a/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/tomcat/download.sh b/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/tomcat/download.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -63,12 +63,13 @@ if [ "$DIST_DIR" = "" -o "$DIST_TGT_LOCATION" = "" -o "$DIST_URL" = "" ]; then
 fi
 
 if [ ! -f "$DIST_TGT_LOCATION" -o "$DOWNLOAD_IF_EXISTS" = "true" ]; then
-    curl -o "$DIST_TGT_LOCATION" "$DIST_URL"
+    mkdir -p "$(dirname "$DIST_TGT_LOCATION")"
+    curl -sS -o "$DIST_TGT_LOCATION" "$DIST_URL"
 fi
 
 if [ "$OVERWRITE" = "true" -o ! -d "$DIST_DIR"/"$DIST_SUBDIR" ]; then
     rm -rf "$DIST_DIR"/"$DIST_SUBDIR"
 
     unzip -o "$DIST_TGT_LOCATION" -d "$DIST_DIR"
     chmod -R 777 "$DIST_DIR"/"$DIST_SUBDIR"
-fi
+fi
diff --git a/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/tomcat/redeploy.sh b/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/tomcat/redeploy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -55,16 +55,16 @@ fi
 
 ab -n50 -c5 "http://localhost:$PORT/$REQUEST_PATH_QUERY"
 
-all_proxy="" http_proxy="" curl "http://tomcat:tomcat@localhost:$PORT/manager/text/undeploy?path=/$CONTEXT_ROOT"
+all_proxy="" http_proxy="" curl -sS "http://tomcat:tomcat@localhost:$PORT/manager/text/undeploy?path=/$CONTEXT_ROOT"
 
 if [ "$SKIP_REDEPLOY" = "true" ]; then
     echo Skipping redeploy.
     exit
 fi
 
-all_proxy="" http_proxy="" curl --upload-file "$WAR_PATH" "http://tomcat:tomcat@localhost:$PORT/manager/text/deploy?path=/$CONTEXT_ROOT&tag=$APPLICATION_NAME"
+all_proxy="" http_proxy="" curl -sS --upload-file "$WAR_PATH" "http://tomcat:tomcat@localhost:$PORT/manager/text/deploy?path=/$CONTEXT_ROOT&tag=$APPLICATION_NAME"
 
 EXIT_CODE=$?
 echo Redeployment finished with $EXIT_CODE
 
-exit $EXIT_CODE
+exit $EXIT_CODE
diff --git a/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/tomcat/start.sh b/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/tomcat/start.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -111,7 +111,7 @@ start_tomcat() {
 }
 
 deploy_tomcat() {
-    all_proxy="" http_proxy="" curl --upload-file "$WAR_PATH" "http://tomcat:tomcat@localhost:$PORT/manager/text/deploy?path=/$CONTEXT_ROOT"
+    all_proxy="" http_proxy="" curl -sS --upload-file "$WAR_PATH" "http://tomcat:tomcat@localhost:$PORT/manager/text/deploy?path=/$CONTEXT_ROOT"
 }
 
 if [ "$SKIP_START_STOP" = "true" ]; then
diff --git a/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/wls/download.sh b/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/wls/download.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -63,12 +63,13 @@ if [ "$DIST_DIR" = "" -o "$DIST_TGT_LOCATION" = "" -o "$DIST_URL" = "" ]; then
 fi
 
 if [ ! -f "$DIST_TGT_LOCATION" -o "$DOWNLOAD_IF_EXISTS" = "true" ]; then
-    curl -o "$DIST_TGT_LOCATION" "$DIST_URL"
+    mkdir -p "$(dirname "$DIST_TGT_LOCATION")"
+    curl -sS -o "$DIST_TGT_LOCATION" "$DIST_URL"
 fi
 
 if [ "$OVERWRITE" = "true" -o ! -d "$DIST_DIR"/"$DIST_SUBDIR" ]; then
     rm -rf "$DIST_DIR"/"$DIST_SUBDIR"
 
     cd "$DIST_DIR"
     java -jar "$DIST_TGT_LOCATION"
-fi
+fi
