summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jdt.core/jdtcore-for-aspectj-src.zipbin3710609 -> 3710623 bytes
-rw-r--r--org.eclipse.jdt.core/jdtcore-for-aspectj.jarbin5494639 -> 5495512 bytes
-rw-r--r--tests/bugs153/pr148537/MyClass.java2
-rw-r--r--tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java2
-rw-r--r--tests/src/org/aspectj/systemtest/ajc153/ajc153.xml4
5 files changed, 5 insertions, 3 deletions
diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 314bc9558..aa828c1c9 100644
--- a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
+++ b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
Binary files differ
diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 7b136a1e9..75d3c01c3 100644
--- a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
+++ b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
Binary files differ
diff --git a/tests/bugs153/pr148537/MyClass.java b/tests/bugs153/pr148537/MyClass.java
index ef6eed9a5..ee449254c 100644
--- a/tests/bugs153/pr148537/MyClass.java
+++ b/tests/bugs153/pr148537/MyClass.java
@@ -2,7 +2,7 @@ import java.lang.annotation.*;
public class MyClass {
- @Retention({RententionPolicy.RUNTIME})
+ @Retention({RetentionPolicy.RUNTIME})
private @interface MyAnnotation {
}
}
diff --git a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
index 574a598dc..8e09602c4 100644
--- a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
@@ -29,7 +29,7 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("verification problem"); // build the code
Utils.verifyClass(ajc,"mypackage.MyAspect"); // verify it <<< BRAND NEW VERIFY UTILITY FOR EVERYONE TO TRY ;)
}
- // public void testIncorrectAnnotationValue_pr148537() { runTest("incorrect annotation value");}
+ public void testIncorrectAnnotationValue_pr148537() { runTest("incorrect annotation value");}
/////////////////////////////////////////
diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
index 3d90e6194..4bc76dd65 100644
--- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
+++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
@@ -43,7 +43,9 @@
</ajc-test>
<ajc-test dir="bugs153/pr148537" title="incorrect annotation value">
- <compile files="MyClass.java" options="-1.5"/>
+ <compile files="MyClass.java" options="-1.5">
+ <message kind="error" line="5" text="Type mismatch: cannot convert from RetentionPolicy[] to RetentionPolicy"/>
+ </compile>
</ajc-test>