Remove direct JAXB/Xerces runtime deps, use APIs only

eclipse · Nov 24, 2019 · a06554c · a06554c
1 parent ff56056
commit a06554c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 27 deletions.
diff --git a/oauth-webapp/pom.xml b/oauth-webapp/pom.xml
@@ -69,10 +69,12 @@
             <groupId>org.apache.wink</groupId>
             <artifactId>wink-json4j</artifactId>
         </dependency>
+<!--
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+-->
 
         <!-- Test -->
         <dependency>

diff --git a/oauth-webapp/src/main/webapp/WEB-INF/web.xml b/oauth-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2011 IBM Corporation.
+    Copyright (c) 2011-2019 IBM Corporation and others
    
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
@@ -9,10 +9,6 @@
     The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
     and the Eclipse Distribution License is available at 
     http://www.eclipse.org/org/documents/edl-v10.php.
-   
-    Contributors:
-   
-        IBM Corporation - initial API and implementation
  -->
 
 
@@ -25,8 +21,8 @@
 	<description>An example demonstrating the Lyo OAuth provider framework.</description>
 	<listener>
 		<listener-class>org.eclipse.lyo.server.oauth.webapp.services.OAuthServletListener</listener-class>
-    </listener>
-	<servlet>
+	</listener>
+	<!--<servlet>
 		<servlet-name>JAX-RS Services</servlet-name>
 		<servlet-class>
 			org.apache.wink.server.internal.servlet.RestServlet
@@ -39,5 +35,5 @@
 	<servlet-mapping>
 		<servlet-name>JAX-RS Services</servlet-name>
 		<url-pattern>/rest/*</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping>-->
 </web-app>
diff --git a/oslc4j-wink/pom.xml b/oslc4j-wink/pom.xml
@@ -68,8 +68,8 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -93,7 +93,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
+        <version>3.1.1</version>
         <configuration>
           <additionalparam>-Xdoclint:none</additionalparam>
         </configuration>

diff --git a/pom.xml b/pom.xml
@@ -79,26 +79,11 @@
         <artifactId>slf4j-api</artifactId>
         <version>1.7.25</version>
       </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>1.3.04</version>
-      </dependency>
-      <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>2.8.0</version>
-      </dependency>
       <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
         <version>2.2</version>
       </dependency>
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>2.2</version>
-      </dependency>
       <dependency>
         <groupId>stax</groupId>
         <artifactId>stax-api</artifactId>
@@ -154,7 +139,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.9</version>
+          <version>3.1.1</version>
           <configuration>
             <additionalparam>-Xdoclint:none</additionalparam>
           </configuration>