Merge branch 'master' of https://github.com/jersey/jersey into link-fixes

Author: Stephan Fuhrmann

LICENSE.html

@@ -270,7 +270,7 @@ <h1><strong>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1</stron
     <h1><strong>The GNU General Public License (GPL) Version 2, June 1991</strong></h1>
 
     <p>Copyright (C) 1989, 1991 Free Software Foundation, Inc.<br/>
-        59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</p>
+        51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA</p>
 
     <p>Everyone is permitted to copy and distribute verbatim copies<br/>
         of this license document, but changing it is not allowed.</p>
@@ -497,7 +497,7 @@ <h1><strong>The GNU General Public License (GPL) Version 2, June 1991</strong></
         License for more details.
     </blockquote>
     <blockquote>You should have received a copy of the GNU General Public License along with this program; if not,
-        write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+        write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
     </blockquote>
     <p>Also add information on how to contact you by electronic and paper mail.</p>
 

LICENSE.txt

@@ -140,7 +140,7 @@ The code released under the CDDL shall be governed by the laws of the State of C
 The GNU General Public License (GPL) Version 2, June 1991
 
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 
@@ -244,7 +244,7 @@ To do so, attach the following notices to the program. It is safest to attach th
 
    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+   You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Also add information on how to contact you by electronic and paper mail.
 

archetypes/jersey-example-java8-webapp/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.jersey.archetypes</groupId>
         <artifactId>project</artifactId>
-        <version>2.21-SNAPSHOT</version>
+        <version>2.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>jersey-example-java8-webapp</artifactId>

archetypes/jersey-heroku-webapp/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.jersey.archetypes</groupId>
         <artifactId>project</artifactId>
-        <version>2.21-SNAPSHOT</version>
+        <version>2.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>jersey-heroku-webapp</artifactId>

archetypes/jersey-quickstart-grizzly2/pom.xml

@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.jersey.archetypes</groupId>
         <artifactId>project</artifactId>
-        <version>2.21-SNAPSHOT</version>
+        <version>2.22-SNAPSHOT</version>
     </parent>
     <artifactId>jersey-quickstart-grizzly2</artifactId>
     <modelVersion>4.0.0</modelVersion>

archetypes/jersey-quickstart-webapp/pom.xml

@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.jersey.archetypes</groupId>
         <artifactId>project</artifactId>
-        <version>2.21-SNAPSHOT</version>
+        <version>2.22-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>

archetypes/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>project</artifactId>
-        <version>2.21-SNAPSHOT</version>
+        <version>2.22-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.jersey.archetypes</groupId>

bom/pom.xml

@@ -53,7 +53,7 @@
 
     <groupId>org.glassfish.jersey</groupId>
     <artifactId>jersey-bom</artifactId>
-    <version>2.21-SNAPSHOT</version>
+    <version>2.22-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>jersey-bom</name>
 

bundles/apidocs/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.jersey.bundles</groupId>
         <artifactId>project</artifactId>
-        <version>2.21-SNAPSHOT</version>
+        <version>2.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>apidocs</artifactId>

bundles/examples/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.jersey.bundles</groupId>
         <artifactId>project</artifactId>
-        <version>2.21-SNAPSHOT</version>
+        <version>2.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>jersey-examples</artifactId>