@@ -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> |
@@ -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> |
@@ -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> |
@@ -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... |
@@ -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); | |||
} | |||
/** |
@@ -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> |