From 653905ead17e82d0a2eb36b541763e5eb1d5b047 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Tue, 4 Jan 2022 17:45:01 +0100
Subject: [PATCH] remove obsolete compiler configuration

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 jaxws-ri/extras/eclipselink_jaxb/pom.xml      | 26 -----------------
 .../src/main/java/module-info.java            |  3 +-
 jaxws-ri/pom.xml                              |  6 ++--
 jaxws-ri/runtime/httpspi-servlet/pom.xml      | 13 +--------
 jaxws-ri/runtime/servlet/pom.xml              | 28 +------------------
 5 files changed, 7 insertions(+), 69 deletions(-)

diff --git a/jaxws-ri/extras/eclipselink_jaxb/pom.xml b/jaxws-ri/extras/eclipselink_jaxb/pom.xml
index 57095df1b..17e900533 100644
--- a/jaxws-ri/extras/eclipselink_jaxb/pom.xml
+++ b/jaxws-ri/extras/eclipselink_jaxb/pom.xml
@@ -73,22 +73,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <configuration>
-                            <!--adds reads for gmbal-->
-                            <compilerArgs>
-                                <arg>--add-reads</arg>
-                                <arg>com.sun.xml.ws.eclipselink=ALL-UNNAMED</arg>
-                            </compilerArgs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -104,16 +88,6 @@
                     <testFailureIgnore>${ignore.failing.tests}</testFailureIgnore>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <additionalJOptions>
-                        <additionalJOption>--add-reads</additionalJOption>
-                        <additionalJOption>com.sun.xml.ws.eclipselink=ALL-UNNAMED</additionalJOption>
-                    </additionalJOptions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/jaxws-ri/extras/eclipselink_jaxb/src/main/java/module-info.java b/jaxws-ri/extras/eclipselink_jaxb/src/main/java/module-info.java
index 9e30f8fd8..21dfeb2af 100644
--- a/jaxws-ri/extras/eclipselink_jaxb/src/main/java/module-info.java
+++ b/jaxws-ri/extras/eclipselink_jaxb/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -14,6 +14,7 @@
     requires jakarta.mail;
 
     requires com.sun.xml.ws;
+    requires org.eclipse.persistence.moxy;
 
     exports com.sun.xml.ws.db.toplink;
 
diff --git a/jaxws-ri/pom.xml b/jaxws-ri/pom.xml
index 4ee15c522..f87796fd3 100644
--- a/jaxws-ri/pom.xml
+++ b/jaxws-ri/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -98,7 +98,7 @@
         <comp.xdoclint>-Xdoclint:none</comp.xdoclint>
         <warn.limit>150</warn.limit>
 
-        <ignore.failing.tests>true</ignore.failing.tests>
+        <ignore.failing.tests>false</ignore.failing.tests>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <oss.disallow.snapshots>true</oss.disallow.snapshots>
         <vendor.name>Eclipse Foundation</vendor.name>
@@ -350,7 +350,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.3.1</version>
                     <configuration>
                         <archive>
                             <manifest>
diff --git a/jaxws-ri/runtime/httpspi-servlet/pom.xml b/jaxws-ri/runtime/httpspi-servlet/pom.xml
index 708004135..35460043f 100644
--- a/jaxws-ri/runtime/httpspi-servlet/pom.xml
+++ b/jaxws-ri/runtime/httpspi-servlet/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -41,15 +41,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <additionalOptions>--add-reads com.sun.xml.ws.httpspi.servlet=ALL-UNNAMED</additionalOptions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/jaxws-ri/runtime/servlet/pom.xml b/jaxws-ri/runtime/servlet/pom.xml
index fdd2d5b29..5f8cf647d 100644
--- a/jaxws-ri/runtime/servlet/pom.xml
+++ b/jaxws-ri/runtime/servlet/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -41,30 +41,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <configuration>
-                            <compilerArgs>
-                                <arg>--add-reads</arg>
-                                <arg>com.sun.xml.ws.servlet=ALL-UNNAMED</arg>
-                            </compilerArgs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <additionalOptions>--add-reads com.sun.xml.ws.servlet=ALL-UNNAMED</additionalOptions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>