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/04 08:35:39 UTC
[GitHub] ebarboni closed pull request #816: create a librarywrapper on
jaxws-api to permit usage of Holder class
ebarboni closed pull request #816: create a librarywrapper on jaxws-api to permit usage of Holder class
URL: https://github.com/apache/incubator-netbeans/pull/816
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/ide/db/nbproject/project.xml b/ide/db/nbproject/project.xml
index 802ca2781c..ec9056ce81 100644
--- a/ide/db/nbproject/project.xml
+++ b/ide/db/nbproject/project.xml
@@ -51,6 +51,15 @@
<specification-version>1.15</specification-version>
</run-dependency>
</dependency>
+ <dependency>
+ <code-name-base>org.netbeans.libs.javaee11</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.1</specification-version>
+ </run-dependency>
+ </dependency>
<dependency>
<code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
<build-prerequisite/>
@@ -159,7 +168,7 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
+ <code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
@@ -167,19 +176,19 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util</code-name-base>
+ <code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>9.3</specification-version>
+ <specification-version>8.0</specification-version>
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
+ <code-name-base>org.openide.util.ui</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.0</specification-version>
+ <specification-version>9.3</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/ide/derby/nbproject/project.xml b/ide/derby/nbproject/project.xml
index d09a65537e..0a8cf765a2 100644
--- a/ide/derby/nbproject/project.xml
+++ b/ide/derby/nbproject/project.xml
@@ -42,6 +42,15 @@
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
+ <dependency>
+ <code-name-base>org.netbeans.libs.javaee11</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.1</specification-version>
+ </run-dependency>
+ </dependency>
<dependency>
<code-name-base>org.netbeans.modules.db</code-name-base>
<build-prerequisite/>
@@ -124,7 +133,7 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
+ <code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
@@ -132,19 +141,19 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util</code-name-base>
+ <code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>9.3</specification-version>
+ <specification-version>8.0</specification-version>
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
+ <code-name-base>org.openide.util.ui</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.0</specification-version>
+ <specification-version>9.3</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/ide/libs.javaee11/build.xml b/ide/libs.javaee11/build.xml
new file mode 100644
index 0000000000..56a24a129e
--- /dev/null
+++ b/ide/libs.javaee11/build.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project name="ide/libs.javaee11" default="netbeans" basedir=".">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/ide/libs.javaee11/manifest.mf b/ide/libs.javaee11/manifest.mf
new file mode 100644
index 0000000000..ac1d37e0b6
--- /dev/null
+++ b/ide/libs.javaee11/manifest.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.libs.javaee11/1
+OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javaee/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.1
+
diff --git a/ide/libs.javaee11/nbproject/project.properties b/ide/libs.javaee11/nbproject/project.properties
new file mode 100644
index 0000000000..641a1631b3
--- /dev/null
+++ b/ide/libs.javaee11/nbproject/project.properties
@@ -0,0 +1,22 @@
+# 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.
+
+file.reference.jaxws-api-2.3.0.jar=release/modules/ext/jaxws-api-2.3.0.jar
+is.autoload=true
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.6
+
diff --git a/ide/libs.javaee11/nbproject/project.xml b/ide/libs.javaee11/nbproject/project.xml
new file mode 100644
index 0000000000..20c8ca21cd
--- /dev/null
+++ b/ide/libs.javaee11/nbproject/project.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+ <code-name-base>org.netbeans.libs.javaee11</code-name-base>
+ <module-dependencies/>
+ <!-- #243938 - use NB's bundled logging JAR instead
+ <class-path-extension>
+ <runtime-relative-path>ext/aws-sdk/commons-logging-1.1.1.jar</runtime-relative-path>
+ <binary-origin>external/commons-logging-1.1.1.jar</binary-origin>
+ </class-path-extension>-->
+ <friend-packages>
+ <friend>org.netbeans.modules.db</friend>
+ <friend>org.netbeans.modules.derby</friend>
+ <package>javax.xml.ws</package>
+ </friend-packages>
+ <class-path-extension>
+ <runtime-relative-path>ext/jaxws-api-2.3.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/jaxws-api-2.3.0.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
+</project>
diff --git a/ide/libs.javaee11/release/modules/ext/jaxws-api-2.3.0.jar b/ide/libs.javaee11/release/modules/ext/jaxws-api-2.3.0.jar
new file mode 100644
index 0000000000..575472d71e
Binary files /dev/null and b/ide/libs.javaee11/release/modules/ext/jaxws-api-2.3.0.jar differ
diff --git a/ide/libs.javaee11/src/org/netbeans/libs/javaee/Bundle.properties b/ide/libs.javaee11/src/org/netbeans/libs/javaee/Bundle.properties
new file mode 100644
index 0000000000..f4ce241801
--- /dev/null
+++ b/ide/libs.javaee11/src/org/netbeans/libs/javaee/Bundle.properties
@@ -0,0 +1,23 @@
+# 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.
+
+## libs/jsch/manifest.mf
+OpenIDE-Module-Name=JavaEE JDK11
+OpenIDE-Module-Display-Category=Libraries
+OpenIDE-Module-Short-Description=JavaEE JDK11 libraries
+OpenIDE-Module-Long-Description=\
+ javaee SDK
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 4e7a87088b..c45c5323a6 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -399,6 +399,7 @@ nb.cluster.ide=\
libs.freemarker,\
libs.git,\
libs.ini4j,\
+ libs.javaee11,\
libs.jaxb,\
libs.jsch.agentproxy,\
libs.json_simple,\
----------------------------------------------------------------
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