Remove no longer required annotations.jar

eclipse-equinox · Oct 6, 2022 · 3039b1e · 3039b1e
1 parent 33ad071
commit 3039b1e
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 9 deletions.
diff --git a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.http.servlet
-Bundle-Version: 1.7.300.qualifier
+Bundle-Version: 1.7.400.qualifier
 Bundle-Activator: org.eclipse.equinox.http.servlet.internal.Activator
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/bundles/org.eclipse.equinox.http.servlet/build.properties b/bundles/org.eclipse.equinox.http.servlet/build.properties
@@ -19,4 +19,3 @@ bin.includes = META-INF/,\
                plugin.properties
 src.includes = about.html
 
-jars.extra.classpath = osgi/osgi.annotation.jar
diff --git a/bundles/org.eclipse.equinox.http.servlet/osgi/osgi.annotation.jar b/bundles/org.eclipse.equinox.http.servlet/osgi/osgi.annotation.jar
diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %osgiServices
 Bundle-SymbolicName: org.eclipse.osgi.services
-Bundle-Version: 3.11.0.qualifier
+Bundle-Version: 3.11.100.qualifier
 Bundle-Description: %osgiServicesDes
 Bundle-Localization: plugin
 Bundle-Vendor: %eclipse.org

diff --git a/bundles/org.eclipse.osgi.services/build.properties b/bundles/org.eclipse.osgi.services/build.properties
@@ -21,4 +21,3 @@ src.includes = about.html,\
 
 source.. = src/
 output.. = bin/
-jars.extra.classpath = lib/osgi.annotation.jar
diff --git a/bundles/org.eclipse.osgi.services/lib/osgi.annotation.jar b/bundles/org.eclipse.osgi.services/lib/osgi.annotation.jar
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -107,7 +107,7 @@ Bundle-Activator: org.eclipse.osgi.internal.framework.SystemBundleActivator
 Bundle-Description: %systemBundle
 Bundle-Copyright: %copyright
 Bundle-Vendor: %eclipse.org
-Bundle-Version: 3.18.100.qualifier
+Bundle-Version: 3.18.200.qualifier
 Bundle-Localization: systembundle
 Bundle-DocUrl: http://www.eclipse.org
 Eclipse-ExtensibleAPI: true

diff --git a/bundles/org.eclipse.osgi/build.properties b/bundles/org.eclipse.osgi/build.properties
@@ -35,6 +35,5 @@ output.. = bin/
 # customBuildCallbacks=customBuildCallbacks.xml
 
 javacWarnings..=-raw,unchecked,hiding,unused,warningToken
-jars.extra.classpath = osgi/osgi.annotation.jar,\
-                       osgi/j9stubs.jar
+jars.extra.classpath = osgi/j9stubs.jar
 jre.compilation.profile = JavaSE-1.8
diff --git a/bundles/org.eclipse.osgi/osgi/osgi.annotation.jar b/bundles/org.eclipse.osgi/osgi/osgi.annotation.jar
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
@@ -19,7 +19,7 @@
 </parent>
   <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi</artifactId>
-  <version>3.18.100-SNAPSHOT</version>
+  <version>3.18.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

diff --git a/features/org.eclipse.equinox.server.jetty/feature.xml b/features/org.eclipse.equinox.server.jetty/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.server.jetty"
       label="%featureName"
-      version="1.11.0.qualifier"
+      version="1.11.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ bin.includes = META-INF/,\
		plugin.properties
		src.includes = about.html

		jars.extra.classpath = osgi/osgi.annotation.jar
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,3 @@ src.includes = about.html,\

		source.. = src/
		output.. = bin/
		jars.extra.classpath = lib/osgi.annotation.jar