Merge pull request #304 from jlahoda/choose-cddl

For various CDDL+GPL libraries, choosing CDDL.
apache · Nov 28, 2017 · 74b7e3f · 74b7e3f
2 parents 8ceff22 + 3167ee6
commit 74b7e3f
Show file tree

Hide file tree

Showing 23 changed files with 2,666 additions and 3,048 deletions.
diff --git a/libs.jaxb/external/binaries-list b/libs.jaxb/external/binaries-list
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-387BE740EAEF52B3F6E6EE2F140757E7632584CE jaxb-impl.jar
-F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3 jaxb1-impl.jar
-C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7 jaxb-xjc.jar
-27FAE927B5B9AE53A5B0ED825575DD8217CE7042 jaxb-api-doc.zip
+387BE740EAEF52B3F6E6EE2F140757E7632584CE com.sun.xml.bind:jaxb-impl:2.2.5-2
+F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3 com.sun.xml.bind:jaxb1-impl:2.2.5-2
+C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7 com.sun.xml.bind:jaxb-xjc:2.2.5-2
+DEA09C627DA5AA8FB0E6B1E39F85B2AE6AE9C3E7 javax.xml.bind:jaxb-api:2.2.5:javadoc
diff --git a/libs.jaxb/external/jaxb-2.2.5-2-license.txt b/libs.jaxb/external/jaxb-2.2.5-2-license.txt
diff --git a/libs.jaxb/external/jaxb-2.2.5-license.txt b/libs.jaxb/external/jaxb-2.2.5-license.txt
diff --git a/libs.jaxb/external/jaxb-api-2.2.5-javadoc-license.txt b/libs.jaxb/external/jaxb-api-2.2.5-javadoc-license.txt
diff --git a/libs.jaxb/nbproject/project.properties b/libs.jaxb/nbproject/project.properties
@@ -18,19 +18,19 @@
 is.autoload=true
 
 jnlp.indirect.jars=\
-    modules/ext/jaxb/jaxb-impl.jar,\
-    modules/ext/jaxb/jaxb1-impl.jar,\
-    modules/ext/jaxb/jaxb-xjc.jar,\
-    docs/jaxb-api-doc.zip
+    modules/ext/jaxb/jaxb-impl-2.2.5-2.jar,\
+    modules/ext/jaxb/jaxb1-impl-2.2.5-2.jar,\
+    modules/ext/jaxb/jaxb-xjc-2.2.5-2.jar,\
+    docs/jaxb-api-2.2.5-javadoc.jar
 
 # pack200 bug in JDK 7 (#7131266)
-pack200.excludes=modules/ext/jaxb/jaxb-xjc.jar
+pack200.excludes=modules/ext/jaxb/jaxb-xjc-2.2.5-2.jar
 
-release.external/jaxb-impl.jar=modules/ext/jaxb/jaxb-impl.jar
-release.external/jaxb1-impl.jar=modules/ext/jaxb/jaxb1-impl.jar
-release.external/jaxb-xjc.jar=modules/ext/jaxb/jaxb-xjc.jar
+release.external/jaxb-impl-2.2.5-2.jar=modules/ext/jaxb/jaxb-impl-2.2.5-2.jar
+release.external/jaxb1-impl-2.2.5-2.jar=modules/ext/jaxb/jaxb1-impl-2.2.5-2.jar
+release.external/jaxb-xjc-2.2.5-2.jar=modules/ext/jaxb/jaxb-xjc-2.2.5-2.jar
 
 # JAXB Javadoc
-release.external/jaxb-api-doc.zip=docs/jaxb-api-doc.zip
+release.external/jaxb-api-2.2.5-javadoc.jar=docs/jaxb-api-2.2.5-javadoc.jar
 
 sigtest.gen.fail.on.error=false
diff --git a/libs.jaxb/nbproject/project.xml b/libs.jaxb/nbproject/project.xml
@@ -113,13 +113,13 @@
                 <package>com.sun.tools.xjc</package>
             </friend-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jaxb/jaxb-impl.jar</runtime-relative-path>
+                <runtime-relative-path>ext/jaxb/jaxb-impl-2.2.5-2.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jaxb/jaxb1-impl.jar</runtime-relative-path>
+                <runtime-relative-path>ext/jaxb/jaxb1-impl-2.2.5-2.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jaxb/jaxb-xjc.jar</runtime-relative-path>
+                <runtime-relative-path>ext/jaxb/jaxb-xjc-2.2.5-2.jar</runtime-relative-path>
             </class-path-extension>
         </data>
     </configuration>

diff --git a/libs.jaxb/src/org/netbeans/libs/jaxb/jaxb.xml b/libs.jaxb/src/org/netbeans/libs/jaxb/jaxb.xml
@@ -27,16 +27,15 @@
     <localizing-bundle>org/netbeans/libs/jaxb/Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb-impl.jar!/</resource>
-        <resource>jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb-xjc.jar!/</resource>
-        <resource>jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb1-impl.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb-impl-2.2.5-2.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb-xjc-2.2.5-2.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb1-impl-2.2.5-2.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.modules.xml.jaxb.api/modules/ext/jaxb/activation.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.modules.xml.jaxb.api/modules/ext/jaxb/api/jaxb-api.jar!/</resource>
-        <resource>jar:nbinst://org.netbeans.modules.xml.jaxb.api/modules/ext/jaxb/api/jsr173_1.0_api.jar!/</resource>
     </volume>
     <volume>
         <type>javadoc</type>
-        <resource>jar:nbinst://org.netbeans.libs.jaxb/docs/jaxb-api-doc.zip!/</resource>
+        <resource>jar:nbinst://org.netbeans.libs.jaxb/docs/jaxb-api-2.2.5-javadoc.jar!/</resource>
     </volume>
     <properties>
         <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->