From 2ecd855ba0c4b6d7ce5c9c5db88e221a3b72740d Mon Sep 17 00:00:00 2001
From: Georg <geo.rgmueller@web.de>
Date: Tue, 1 Feb 2022 15:53:00 +0100
Subject: [PATCH 1/8] Update pom.xml

fix broken license url for asm objectweb
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 170803faca..ba7777a6f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,7 +188,7 @@
         </license>
         <license>
             <name>Modified BSD</name>
-            <url>http://asm.objectweb.org/license.html</url>
+            <url>https://asm.ow2.io/license.html</url>
             <distribution>repo</distribution>
             <comments>ASM @ jersey.repackaged.org.objectweb.asm</comments>
         </license>

From a2c34a60054b3e4014c4b99ef0c7184de43b63c0 Mon Sep 17 00:00:00 2001
From: Georg <geo.rgmueller@web.de>
Date: Tue, 1 Feb 2022 16:16:57 +0100
Subject: [PATCH 2/8] update copyright
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Georg Müller geo.rgmueller@web.de
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ba7777a6f7..386dd42f00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

From 5542de1355e9086f1c88c5679e915e7ed025f046 Mon Sep 17 00:00:00 2001
From: Georg <geo.rgmueller@web.de>
Date: Wed, 2 Feb 2022 11:56:00 +0100
Subject: [PATCH 3/8] fix broken license url for asm objectweb

---
 core-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-server/pom.xml b/core-server/pom.xml
index 2d21bbd2c5..09b0c55af2 100644
--- a/core-server/pom.xml
+++ b/core-server/pom.xml
@@ -56,7 +56,7 @@
         </license>
         <license>
             <name>Modified BSD</name>
-            <url>http://asm.objectweb.org/license.html</url>
+            <url>https://asm.ow2.io/license.html</url>
             <distribution>repo</distribution>
             <comments>ASM @ jersey.repackaged.org.objectweb.asm</comments>
         </license>

From 4b1ea7ad0e8243e73e14a90eaabfcaa08bd2f238 Mon Sep 17 00:00:00 2001
From: Georg <geo.rgmueller@web.de>
Date: Wed, 2 Feb 2022 11:59:22 +0100
Subject: [PATCH 4/8] Update copyright year

---
 core-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-server/pom.xml b/core-server/pom.xml
index 09b0c55af2..a224311e2a 100644
--- a/core-server/pom.xml
+++ b/core-server/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

From ddd3ec1b0ef79bf7cf9d3a5edbd51216d5db5e4b Mon Sep 17 00:00:00 2001
From: Georg <geo.rgmueller@web.de>
Date: Wed, 2 Feb 2022 15:38:18 +0100
Subject: [PATCH 5/8] Fix broken license url for asm objectweb

---
 NOTICE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE.md b/NOTICE.md
index 9e0b85084d..c0ef15f056 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -96,7 +96,7 @@ KineticJS, v4.7.1
 * Copyright: Eric Rowell
 
 org.objectweb.asm Version 8.0
-* License: Modified BSD (http://asm.objectweb.org/license.html)
+* License: Modified BSD (https://asm.ow2.io/license.html)
 * Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
 
 org.osgi.core version 6.0.0

From ca7a304448ac98e270aebdc4dc43c28ac48a7597 Mon Sep 17 00:00:00 2001
From: Georg <geo.rgmueller@web.de>
Date: Wed, 2 Feb 2022 15:42:15 +0100
Subject: [PATCH 6/8] Update NOTICE.md

---
 examples/NOTICE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/NOTICE.md b/examples/NOTICE.md
index 2c8eb80984..4330b16afd 100644
--- a/examples/NOTICE.md
+++ b/examples/NOTICE.md
@@ -87,7 +87,7 @@ KineticJS, v4.7.1
 * Copyright: Eric Rowell
 
 org.objectweb.asm Version 7.2
-* License: Modified BSD (http://asm.objectweb.org/license.html)
+* License: Modified BSD (https://asm.ow2.io/license.html)
 * Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
 
 org.osgi.core version 6.0.0

From 22f5c571725a68da011e0af1e9e3898277025a0b Mon Sep 17 00:00:00 2001
From: Georg <geo.rgmueller@web.de>
Date: Wed, 2 Feb 2022 15:43:57 +0100
Subject: [PATCH 7/8] Fix broken license url for asm objectweb

---
 core-server/src/main/resources/META-INF/NOTICE.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-server/src/main/resources/META-INF/NOTICE.markdown b/core-server/src/main/resources/META-INF/NOTICE.markdown
index 4dfbd7f80f..f975c4963c 100644
--- a/core-server/src/main/resources/META-INF/NOTICE.markdown
+++ b/core-server/src/main/resources/META-INF/NOTICE.markdown
@@ -37,7 +37,7 @@ org.glassfish.jersey.server.internal.monitoring.core
 * Copyright 2010-2013 Coda Hale and Yammer, Inc.
 
 org.objectweb.asm Version 8.0
-* License: Modified BSD (http://asm.objectweb.org/license.html)
+* License: Modified BSD (https://asm.ow2.io/license.html)
 * Copyright: (c) 2000-2011 INRIA, France Telecom. All rights reserved.
 
 W3.org documents

From 15b161944bb79338e0581df0f30d2c0aef3a040a Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Thu, 3 Feb 2022 09:18:13 +0100
Subject: [PATCH 8/8] migrate apidoc references for JAXRS-API to rest

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 docs/src/main/docbook/jersey.ent | 6 +++---
 pom.xml                          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent
index da6a05df7f..9ebf17b6e5 100644
--- a/docs/src/main/docbook/jersey.ent
+++ b/docs/src/main/docbook/jersey.ent
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!--
 
-    Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -56,8 +56,8 @@
 <!ENTITY jaxb.release.uri "https://eclipse-ee4j.github.io/jaxb-ri">
 <!ENTITY jaxb.javadoc.uri "&jaxb.release.uri;/docs/api/javax/xml/bind">
 <!ENTITY jaxrs.release.uri "https://github.com/eclipse-ee4j/jaxrs-api">
-<!ENTITY jaxrs.javadoc.uri "https://eclipse-ee4j.github.io/jaxrs-api/apidocs/2.1.6/javax/ws/rs">
-<!ENTITY jaxrs21.javadoc.uri "https://eclipse-ee4j.github.io/jaxrs-api/apidocs/2.1.6/javax/ws/rs">
+<!ENTITY jaxrs.javadoc.uri "https://jakartaee.github.io/rest/apidocs/2.1.6/javax/ws/rs">
+<!ENTITY jaxrs21.javadoc.uri "https://jakartaee.github.io/rest/apidocs/2.1.6/javax/ws/rs">
 <!ENTITY jsonb.javadoc.uri "https://javaee.github.io/javaee-spec/javadocs/javax/json/bind">
 <!ENTITY jersey.documentation.uri "https://eclipse-ee4j.github.io/jersey.github.io">
 
diff --git a/pom.xml b/pom.xml
index 386dd42f00..2abb04d3c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,7 +462,7 @@
                                 All Rights Reserved. Use is subject to license terms.]]>
                         </bottom>
                         <links>
-                            <link>https://eclipse-ee4j.github.io/jaxrs-api/apidocs/2.1.6/</link>
+                            <link>https://jakartaee.github.io/rest/apidocs/2.1.6/</link>
                             <link>https://javaee.github.io/hk2/apidocs/</link>
                         </links>
                         <excludePackageNames>