[NETBEANS-1074] Module Review j2eeapis

wqskhn · Sep 10, 2018 · 75c22a7 · 75c22a7
1 parent acd11c8
commit 75c22a7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 12 deletions.
diff --git a/...port.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java b/...port.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
@@ -497,7 +497,7 @@ public void testThatFriendPackagesAreGeneratedInTheRightOrder_61882() throws Exc
                 "</public-packages>\n" +
                 "<class-path-extension>\n" +
                 "<runtime-relative-path>ext/jsr88javax.jar</runtime-relative-path>\n" +
-                "<binary-origin>../external/jsr88javax.jar</binary-origin>\n" +
+                "<binary-origin>../external/deployment-api-1.2-rev-1.jar</binary-origin>\n" +
                 "</class-path-extension>\n" +
                 "</data>\n" +
                 "</configuration>\n" +
@@ -743,7 +743,7 @@ private NbModuleProject generateTestingProject(final String testDependencies) th
                 "</friend-packages>\n" +
                 "<class-path-extension>\n" +
                 "<runtime-relative-path>ext/jsr88javax.jar</runtime-relative-path>\n" +
-                "<binary-origin>../external/jsr88javax.jar</binary-origin>\n" +
+                "<binary-origin>../external/deployment-api-1.2-rev-1.jar</binary-origin>\n" +
                 "</class-path-extension>\n" +
                 "</data>\n" +
                 "</configuration>\n" +

diff --git a/...t/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java b/...t/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java
@@ -112,7 +112,7 @@ private NbModuleProject generateTestingProject() throws Exception {
                 "</friend-packages>\n" +
                 "<class-path-extension>\n" +
                 "<runtime-relative-path>ext/jsr88javax.jar</runtime-relative-path>\n" +
-                "<binary-origin>../external/jsr88javax.jar</binary-origin>\n" +
+                "<binary-origin>../external/deployment-api-1.2-rev-1.jar</binary-origin>\n" +
                 "</class-path-extension>\n" +
                 "</data>\n" +
                 "</configuration>\n" +

diff --git a/j2ee.ant/nbproject/project.xml b/j2ee.ant/nbproject/project.xml
@@ -99,7 +99,7 @@
             <public-packages/>
             <extra-compilation-unit>
                 <package-root>antsrc</package-root>
-                <classpath>${module.classpath}:${ant.jar}:${tools.jar}:../j2eeapis/external/jsr88javax.jar</classpath>
+                <classpath>${module.classpath}:${ant.jar}:${tools.jar}:../j2eeapis/external/deployment-api-1.2-rev-1.jar</classpath>
                 <built-to>build/antclasses</built-to>
                 <built-to>${cluster}/ant/nblib/org-netbeans-modules-j2ee-ant.jar</built-to>
             </extra-compilation-unit>

diff --git a/j2eeapis/external/binaries-list b/j2eeapis/external/binaries-list
@@ -1 +1,17 @@
-EC24BF46E047E735ED802DFA8B9FCA2ED8FB11B0 jsr88javax.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+F68BDB04BB341A866B7780AE4232A1BBADFBDECE javax.enterprise.deploy:deployment-api:1.2-rev-1
diff --git a/j2eeapis/external/jsr88javax-license.txt → ...rnal/deployment-api-1.2-rev-1-license.txt b/j2eeapis/external/jsr88javax-license.txt → ...rnal/deployment-api-1.2-rev-1-license.txt
@@ -1,9 +1,8 @@
-Name: JSR 88
+Name: Java EE Deployment API
 License: CDDL-1.0
-OSR: 136590
-Description: J2EE Deployment APIs 1.1
-Version: 88
-Origin: Oracle (http://jcp.org/aboutJava/communityprocess/mrel/jsr088/index.html)
+Description: Java EE Deployment API
+Version: 1.2-rev-1
+Origin: http://jcp.org/en/jsr/detail?id=88
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 

diff --git a/j2eeapis/nbproject/project.properties b/j2eeapis/nbproject/project.properties
@@ -16,4 +16,4 @@
 # under the License.
 
 is.autoload=true
-release.external/jsr88javax.jar=modules/ext/jsr88javax.jar
+release.external/deployment-api-1.2-rev-1.jar=modules/ext/jsr88javax.jar
diff --git a/j2eeapis/nbproject/project.xml b/j2eeapis/nbproject/project.xml
@@ -30,7 +30,7 @@
             </public-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/jsr88javax.jar</runtime-relative-path>
-                <binary-origin>external/jsr88javax.jar</binary-origin>
+                <binary-origin>external/deployment-api-1.2-rev-1.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>