Merge pull request #75 from basilevs/e431

Update publishing branch e431

Author: aclement

.gitignore

@@ -35,3 +35,5 @@ out/
 
 # IDEA downloaded OSGi core library
 /lib/osgi.core-*.jar
+*.versionsBackup
+.DS_Store

org.aspectj-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.aspectj"
       label="%featureName"
-      version="1.9.22.qualifier"
+      version="1.9.25.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.aspectj">
 

org.aspectj-feature/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<groupId>org.aspectj.ajde</groupId>
-	<version>1.9.22-SNAPSHOT</version>
+	<version>1.9.25-SNAPSHOT</version>
 	<artifactId>org.aspectj</artifactId>
 	<packaging>eclipse-feature</packaging>
 

org.aspectj.ajde/META-INF/MANIFEST.MF

@@ -3,12 +3,11 @@ Automatic-Module-Name: org.aspectj.ajde
 Bundle-ManifestVersion: 2
 Bundle-Name: AspectJ
 Bundle-SymbolicName: org.aspectj.ajde; singleton:=true
-Bundle-Version: 1.9.22.qualifier
+Bundle-Version: 1.9.25.qualifier
 Bundle-Vendor: Eclipse AspectJ Development Tools
 Export-Package: org.aspectj.ajde.core,
  org.aspectj.ajde.core.internal,
  org.aspectj.ajdt.ajc,
- org.aspectj.ajdt.compiler,
  org.aspectj.ajdt.core,
  org.aspectj.ajdt.core.dom,
  org.aspectj.ajdt.internal.compiler,
@@ -66,7 +65,9 @@ Require-Bundle: org.apache.ant,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.text,
- org.aspectj.weaver;bundle-version="1.9.22";visibility:=reexport
+ org.aspectj.weaver;bundle-version="1.9.25";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.aspectj.org.eclipse.jdt.core.JavaCore
 Eclipse-BundleShape: jar
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ classes/

org.aspectj.ajde/build.properties

@@ -3,7 +3,8 @@ bin.includes = about.html,\
                plugin.xml,\
                toc.xml,\
                .,\
-               META-INF/
+               META-INF/,\
+               classes/
 
 customBuildCallbacks=customBuildCallbacks.xml
 qualifier=${ajde.version}

org.aspectj.ajde/pom.xml

@@ -6,7 +6,7 @@
     <dependency>
       <groupId>org.aspectj.ajde</groupId>
       <artifactId>org.aspectj.weaver</artifactId>
-      <version>1.9.22-SNAPSHOT</version>
+      <version>1.9.25-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -19,7 +19,7 @@
 
 	<groupId>org.aspectj.ajde</groupId>
 	<artifactId>org.aspectj.ajde</artifactId>
-	<version>1.9.22-SNAPSHOT</version>
+	<version>1.9.25-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>

org.aspectj.runtime/.classpath

@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="classes" sourcepath="source"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.aspectj.runtime/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17

org.aspectj.runtime/META-INF/MANIFEST.MF

@@ -3,20 +3,21 @@ Automatic-Module-Name: org.aspectj.runtime
 Bundle-ManifestVersion: 2
 Bundle-Name: AspectJ Runtime
 Bundle-SymbolicName: org.aspectj.runtime
-Bundle-Version: 1.9.22.qualifier
+Bundle-Version: 1.9.25.qualifier
 Bundle-Vendor: Eclipse AspectJ Development Tools
-Export-Package: org.aspectj.internal.lang.annotation;version="1.9.22",
- org.aspectj.internal.lang.reflect;version="1.9.22",
- org.aspectj.lang;version="1.9.22",
- org.aspectj.lang.annotation;version="1.9.22",
- org.aspectj.lang.internal.lang;version="1.9.22",
- org.aspectj.lang.reflect;version="1.9.22",
- org.aspectj.runtime;version="1.9.22",
- org.aspectj.runtime.internal;version="1.9.22",
- org.aspectj.runtime.internal.cflowstack;version="1.9.22",
- org.aspectj.runtime.reflect;version="1.9.22"
+Export-Package: org.aspectj.internal.lang.annotation;version="1.9.25",
+ org.aspectj.internal.lang.reflect;version="1.9.25",
+ org.aspectj.lang;version="1.9.25",
+ org.aspectj.lang.annotation;version="1.9.25",
+ org.aspectj.lang.internal.lang;version="1.9.25",
+ org.aspectj.lang.reflect;version="1.9.25",
+ org.aspectj.runtime;version="1.9.25",
+ org.aspectj.runtime.internal;version="1.9.25",
+ org.aspectj.runtime.internal.cflowstack;version="1.9.25",
+ org.aspectj.runtime.reflect;version="1.9.25"
 Eclipse-BundleShape: jar
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ classes/
 Implementation-Version: 1.9.22
 Implementation-Vendor: aspectj.org

org.aspectj.runtime/build.properties

@@ -1,6 +1,7 @@
 bin.includes = about.html,\
                .,\
-               META-INF/
+               META-INF/,\
+               classes/
 
 customBuildCallbacks=customBuildCallbacks.xml
 qualifier=${ajde.version}