Fixes #22206: Integrate JASPIC and Security API in EE 8 web profile A…

…PI (#22195) * Add JASPIC and Security API to web-api, add JACC and Connector apis for compile purpose * remove JASPIC from full profile pom, as it will pulled as part of web-api * Add ee and se api links, add implSpec tag to remove implSpec warnings, remove jacc and jca api from web-profile * Update JSR 375 api to 1.0-b12
javaee · Aug 14, 2017 · a18f292 · a18f292
1 parent da75564
commit a18f292
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/appserver/javaee-api/javax.javaee-api/pom.xml b/appserver/javaee-api/javax.javaee-api/pom.xml
@@ -151,11 +151,6 @@
             <artifactId>javax.security.jacc-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>javax.security.auth.message</groupId>
-            <artifactId>javax.security.auth.message-api</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>javax.enterprise.concurrent</groupId>
             <artifactId>javax.enterprise.concurrent-api</artifactId>

diff --git a/appserver/javaee-api/javax.javaee-web-api/pom.xml b/appserver/javaee-api/javax.javaee-web-api/pom.xml
@@ -211,5 +211,15 @@
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>javax.security.auth.message</groupId>
+            <artifactId>javax.security.auth.message-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>javax.security.enterprise</groupId>
+            <artifactId>javax.security.enterprise-api</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>
diff --git a/appserver/javaee-api/pom.xml b/appserver/javaee-api/pom.xml
@@ -199,6 +199,17 @@
     <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
 ]]>
                         </bottom>
+                        <links>
+                            <link>http://docs.oracle.com/javase/8/docs/api/</link>
+                            <link>http://docs.oracle.com/javaee/7/api/</link>
+                        </links>
+                        <tags>
+                            <tag>
+                                <name>implSpec</name>
+                                <placement>a</placement>
+                                <head>Implementation Specification:</head>
+                            </tag>
+                        </tags>
                     </configuration>
                 </plugin>
             </plugins>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -81,7 +81,7 @@
         <javax.security.auth.message-api.version>1.1</javax.security.auth.message-api.version>
         <!-- Ensure that nucleus/pom.xml's javax.validation property is of same value as the one below -->
         <javax.validation-api.version>2.0.0.CR3</javax.validation-api.version>
-        <javax.security.enterprise-api.version>1.0-b11</javax.security.enterprise-api.version>
+        <javax.security.enterprise-api.version>1.0-b12</javax.security.enterprise-api.version>
         <javax.security.enterprise.version>1.0-b11</javax.security.enterprise.version>
 
         <product.name>GlassFish Server Open Source Edition</product.name>