Jakartification: ajust after merge

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>

pom.xml

diff --git a/pom.xml b/pom.xml
index a4e0c00..c830fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2096,7 +2096,6 @@
         <hk2.config.version>5.1.0</hk2.config.version>
         <httpclient.version>4.5.9</httpclient.version>
         <jackson.version>2.10.1</jackson.version>
-        <jackson1.version>1.9.13</jackson1.version>
         <javassist.version>3.25.0-GA</javassist.version>
         <jboss.logging.version>3.3.0.Final</jboss.logging.version>
         <jersey1.version>1.19.3</jersey1.version>

tests/integration/jersey-2689/pom.xml

diff --git a/tests/integration/jersey-2689/pom.xml b/tests/integration/jersey-2689/pom.xml
index e323f09..f13b7a0 100644
--- a/tests/integration/jersey-2689/pom.xml
+++ b/tests/integration/jersey-2689/pom.xml
@@ -84,11 +84,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
-            <!-- TODO enable plugin after jakartification -->
-            <!--<plugin>
+            <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-            </plugin>-->
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -110,15 +109,12 @@
                             </excludes>
                         </configuration>
                     </plugin>
+                    <!-- TODO remove after jakartification -->
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <!-- TODO remove after jakartification -->
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-maven-plugin</artifactId>
                         <configuration>
-                            <excludes> <!--JDK 8 -->
-                                <exclude>org/glassfish/jersey/tests/integration/jersey2689/Jersey2689ITCase.java
-                                </exclude>
-                            </excludes>
+                            <skip>true</skip>
                         </configuration>
                     </plugin>
                 </plugins>

tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java

diff --git a/tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java b/tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java
index ee620f4..e69de29 100644
--- a/tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java
+++ b/tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.tests.jettyresponseclose;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-
-@Path("/")
-public class Resource {
-    @GET
-    public String get() {
-        return Resource.class.getName();
-    }
-}

tests/osgi/functional/pom.xml

diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml
index e41f405..6fbe70d 100644
--- a/tests/osgi/functional/pom.xml
+++ b/tests/osgi/functional/pom.xml
@@ -430,7 +430,6 @@
                                 <exclude>org/glassfish/jersey/osgi/test/basic/BasicOsgiIntegrationTest.java</exclude>
                                 <exclude>org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java</exclude>
                                 <exclude>org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java</exclude>
-                                <exclude>org/glassfish/jersey/osgi/test/basic/JsonJackson1Test.java</exclude>
                                 <exclude>org/glassfish/jersey/osgi/test/basic/JsonJacksonTest.java</exclude>
                                 <exclude>org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java</exclude>
                                 <exclude>org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java</exclude>