Merge pull request apache#2302 from matthiasblaesing/fix-libraries

Fix library definitions causing warnings at startup
lvxingtu · Aug 9, 2020 · 6c58b10 · 6c58b10
2 parents 61123c2 + 1387f10
commit 6c58b10
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 72 deletions.
diff --git a/java/libs.javacapi/manifest.mf b/java/libs.javacapi/manifest.mf
@@ -2,5 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.libs.javacapi
 OpenIDE-Module-Implementation-Version: 3
 OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javacapi/Bundle.properties
-OpenIDE-Module-Layer: org/netbeans/libs/javacapi/layer.xml
 OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2
diff --git a/java/libs.javacapi/src/org/netbeans/libs/javacapi/Bundle.properties b/java/libs.javacapi/src/org/netbeans/libs/javacapi/Bundle.properties
@@ -19,7 +19,3 @@ OpenIDE-Module-Long-Description=\
     The javac public API, as defined by JSR 199, JSR 269, and the com.sun.source packages defined in JDK 6.
 OpenIDE-Module-Name=Javac API Wrapper
 OpenIDE-Module-Short-Description=The javac public API
-
-##library file from layer
-javac-api=Java Tree API
-
diff --git a/java/libs.javacapi/src/org/netbeans/libs/javacapi/javac-library.xml b/java/libs.javacapi/src/org/netbeans/libs/javacapi/javac-library.xml
diff --git a/java/libs.javacapi/src/org/netbeans/libs/javacapi/layer.xml b/java/libs.javacapi/src/org/netbeans/libs/javacapi/layer.xml
diff --git a/java/libs.springframework/nbproject/project.properties b/java/libs.springframework/nbproject/project.properties
@@ -92,12 +92,10 @@ jnlp.indirect.jars=\
     modules/ext/spring-3.0/spring-aop-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-aspects-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-beans-3.2.18.RELEASE.jar,\
-    modules/ext/spring-3.0/spring-build-src-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-context-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-context-support-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-core-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-expression-3.2.18.RELEASE.jar,\
-    modules/ext/spring-3.0/spring-framework-bom-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-instrument-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-instrument-tomcat-3.2.18.RELEASE.jar,\
     modules/ext/spring-3.0/spring-jdbc-3.2.18.RELEASE.jar,\

diff --git a/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework300.xml b/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework300.xml
@@ -31,12 +31,10 @@
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-aop-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-aspects-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-beans-3.2.18.RELEASE.jar!/</resource>
-        <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-build-src-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-context-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-context-support-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-core-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-expression-3.2.18.RELEASE.jar!/</resource>
-        <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-framework-bom-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-instrument-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-instrument-tomcat-3.2.18.RELEASE.jar!/</resource>
         <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-jdbc-3.2.18.RELEASE.jar!/</resource>