Update to new eclipse compiler version

diff --git a/build/usedForMavenUpload/aspectjrt.pom b/build/usedForMavenUpload/aspectjrt.pom
index e5d94b827979e1b46492165b0cc9d7f63a20d427..8f2813bdd38e806bd431eebc8ee455110d959ced 100644 (file)
--- a/build/usedForMavenUpload/aspectjrt.pom
+++ b/build/usedForMavenUpload/aspectjrt.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjrt</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.BUILD-SNAPSHOT</version>
+  <version>1.8.1.BUILD-SNAPSHOT</version>
   <name>AspectJ runtime</name>
   <description>The runtime needed to execute a program using AspectJ</description>
   <url>http://www.aspectj.org</url>

diff --git a/build/usedForMavenUpload/aspectjtools.pom b/build/usedForMavenUpload/aspectjtools.pom
index 565126cfbe5834d0464d228f13b71097a6cb8886..960dd955d5eef431e761b44ed11f2476bc7a45fb 100644 (file)
--- a/build/usedForMavenUpload/aspectjtools.pom
+++ b/build/usedForMavenUpload/aspectjtools.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjtools</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.BUILD-SNAPSHOT</version>
+  <version>1.8.1.BUILD-SNAPSHOT</version>
   <name>AspectJ tools</name>
   <description>Tools from the AspectJ project</description>
   <url>http://www.aspectj.org</url>

diff --git a/build/usedForMavenUpload/aspectjweaver.pom b/build/usedForMavenUpload/aspectjweaver.pom
index 03152bbfcfbae18b36342e33f1b126186513d8be..44bcfe55d50e4f56571a9cf32e6b471b0f98d2a9 100644 (file)
--- a/build/usedForMavenUpload/aspectjweaver.pom
+++ b/build/usedForMavenUpload/aspectjweaver.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjweaver</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.BUILD-SNAPSHOT</version>
+  <version>1.8.1.BUILD-SNAPSHOT</version>
   <name>AspectJ weaver</name>
   <description>The AspectJ weaver introduces advices to java classes</description>
   <url>http://www.aspectj.org</url>

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
index 64ca22c7fd86753d464c24ac3cf2726fa6d4bf41..51bbc925d2adf290909fcd544a62bde0b311121b 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
@@ -4,8 +4,8 @@
      The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
      org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. 
 ### AspectJ-specific messages 
-compiler.name = AspectJ Compiler 1.8.0
-compiler.version = Eclipse Compiler BETA_JAVA8_8661797, 3.9
+compiler.name = AspectJ Compiler 1.8.1
+compiler.version = Eclipse Compiler BETA_JAVA8_3f60ba6, 3.10
 compiler.copyright = 
 
 ## this next one superceded by above...

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
index 4f0dc27e07168a947b41b184103a6a107224b197..81741a8f8a6f85bc9da54a7d0e3a4b2dd0d551ac 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
@@ -631,7 +631,7 @@ public class AjProblemReporter extends ProblemReporter {
         * implementation if the target type doesn't supply one. This test may not be complete - it is possible that it should read if
         * *either* is an ITD...but I dont have a testcase that shows that is required. yet. (pr115788)
         */
-       public void duplicateInheritedMethods(SourceTypeBinding type, MethodBinding inheritedMethod1, MethodBinding inheritedMethod2) {
+       public void duplicateInheritedMethods(SourceTypeBinding type, MethodBinding inheritedMethod1, MethodBinding inheritedMethod2, boolean isJava8) {
                if (inheritedMethod1 instanceof InterTypeMethodBinding || inheritedMethod2 instanceof InterTypeMethodBinding)
                        return;
                if ((inheritedMethod1 instanceof ParameterizedMethodBinding)
@@ -640,7 +640,7 @@ public class AjProblemReporter extends ProblemReporter {
                if ((inheritedMethod2 instanceof ParameterizedMethodBinding)
                                && ((ParameterizedMethodBinding) inheritedMethod2).original() instanceof InterTypeMethodBinding)
                        return;
-               super.duplicateInheritedMethods(type, inheritedMethod1, inheritedMethod2);
+               super.duplicateInheritedMethods(type, inheritedMethod1, inheritedMethod2, isJava8);
        }
 
        /**

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 02615a7711775b628ad89688394585f96339f734..472674fce57899a3e33c7788c4d5808b6be42b98 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 9eb94c5ef082ffd73cffd57e4ee581d7581c2a96..2b8084a6b040ac01de88e71089d6ad489adf552f 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ

diff --git a/run-all-junit-tests/RunTheseBeforeYouCommitTests_NODEBUG.launch b/run-all-junit-tests/RunTheseBeforeYouCommitTests_NODEBUG.launch
deleted file mode 100644 (file)
index 47bb30e..0000000
--- a/run-all-junit-tests/RunTheseBeforeYouCommitTests_NODEBUG.launch
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="RunTheseBeforeYouCommitTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="run-all-junit-tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.aspectj.tools.ajc.Ajc.verbose=false -Dorg.aspectj.tools.ajc.AjcTestCase.verbose=false -Xmx768M -XX:MaxPermSize=256m"/>
-</launchConfiguration>