You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/10 09:34:17 UTC
[GitHub] matthiasblaesing closed pull request #853: [NETBEANS-1074] Module
Review j2eeapis
matthiasblaesing closed pull request #853: [NETBEANS-1074] Module Review j2eeapis
URL: https://github.com/apache/incubator-netbeans/pull/853
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
index 8689157088..bcffb2ce4d 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
+++ b/apisupport/apisupport.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/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java
index d07edb0fb2..20839fd764 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestModuleDependencyTest.java
+++ b/apisupport/apisupport.ant/test/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
index be00ed8a25..c2486edaf5 100644
--- 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
index 8f48f90365..2e765a5695 100644
--- 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 b/j2eeapis/external/deployment-api-1.2-rev-1-license.txt
similarity index 99%
rename from j2eeapis/external/jsr88javax-license.txt
rename to j2eeapis/external/deployment-api-1.2-rev-1-license.txt
index 79cd393af7..2c9ccf382c 100644
--- a/j2eeapis/external/jsr88javax-license.txt
+++ b/j2eeapis/external/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
index ba52d99585..0191c9e729 100644
--- 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
index ac377aaad6..96d8ec08c6 100644
--- 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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists