From cbdb8e067c1c2b0d8ac19015ea4f7aa224eb54de Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 26 Nov 2021 07:34:01 +0100 Subject: Incorporate JDT Core fix + test for #105 Signed-off-by: Alexander Kriegisch --- pom.xml | 2 +- tests/bugs198/github_105/Application.java | 18 +++++++++++++++ tests/bugs198/github_105/BarAnnotation.java | 11 +++++++++ tests/bugs198/github_105/FooAnnotation.java | 8 +++++++ tests/bugs198/github_105/FooAspect.aj | 4 ++++ .../aspectj/systemtest/ajc198/Bugs198Tests.java | 26 ++++++++++++++++++++++ .../org/aspectj/systemtest/ajc198/ajc198.xml | 6 +++++ 7 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 tests/bugs198/github_105/Application.java create mode 100644 tests/bugs198/github_105/BarAnnotation.java create mode 100644 tests/bugs198/github_105/FooAnnotation.java create mode 100644 tests/bugs198/github_105/FooAspect.aj create mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java diff --git a/pom.xml b/pom.xml index 7a4aa2e91..2a816afb2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ true - 1.9.8.RC2 + 1.9.8.RC3 9.2 1.6.3 2.6.2 diff --git a/tests/bugs198/github_105/Application.java b/tests/bugs198/github_105/Application.java new file mode 100644 index 000000000..bcf4f5624 --- /dev/null +++ b/tests/bugs198/github_105/Application.java @@ -0,0 +1,18 @@ +import java.lang.annotation.Annotation; + +/** + * {@code FooAspect} should add {@code @BarAnnotation(name = "from FooAspect")}. + *

+ * This fails in AspectJ 1.9.5 to 1.9.8.RC2 due to a removed safeguard in JDT Core, + * if the aspect is in a separate library on the aspectpath. + *

+ * See https://github.com/eclipse/org.aspectj/issues/105 + */ +@FooAnnotation +public class Application { + public static void main(String[] args) { + for (Annotation annotation : Application.class.getDeclaredAnnotations()) { + System.out.println(annotation); + } + } +} diff --git a/tests/bugs198/github_105/BarAnnotation.java b/tests/bugs198/github_105/BarAnnotation.java new file mode 100644 index 000000000..eaee4af2a --- /dev/null +++ b/tests/bugs198/github_105/BarAnnotation.java @@ -0,0 +1,11 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +public @interface BarAnnotation { + // Note: no default value + String name(); +} diff --git a/tests/bugs198/github_105/FooAnnotation.java b/tests/bugs198/github_105/FooAnnotation.java new file mode 100644 index 000000000..17e79deb4 --- /dev/null +++ b/tests/bugs198/github_105/FooAnnotation.java @@ -0,0 +1,8 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface FooAnnotation {} diff --git a/tests/bugs198/github_105/FooAspect.aj b/tests/bugs198/github_105/FooAspect.aj new file mode 100644 index 000000000..0d8e10d9b --- /dev/null +++ b/tests/bugs198/github_105/FooAspect.aj @@ -0,0 +1,4 @@ +public aspect FooAspect { + declare @type:(@FooAnnotation *) : + @BarAnnotation(name = "from FooAspect"); +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java new file mode 100644 index 000000000..69d484590 --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2021 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + *******************************************************************************/ +package org.aspectj.systemtest.ajc198; + +import org.aspectj.testing.XMLBasedAjcTestCase; + +/** + * @author Alexander Kriegisch + */ +public class Bugs198Tests extends XMLBasedAjcTestCase { + + public void testGitHub_105() { + runTest("ITD annotation with mandatory parameter via aspectpath"); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("ajc198.xml"); + } + +} diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml index c182b58b9..dfe86e2a9 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml @@ -3,6 +3,12 @@ + + + + + + -- cgit v1.2.3 From 90ae35226e9bc9b06c1c8315cce0ced98fba3686 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 26 Nov 2021 08:55:53 +0100 Subject: More minor 1.9.7 to 1.9.8 version bumps in docs Signed-off-by: Alexander Kriegisch --- docs/developer/RELEASE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developer/RELEASE.md b/docs/developer/RELEASE.md index ed06f6932..3d0db25be 100644 --- a/docs/developer/RELEASE.md +++ b/docs/developer/RELEASE.md @@ -121,7 +121,7 @@ Before we release the staging repository though, we want to commit and tag the r git commit -am "Set version to 1.9.8.M2" # Tag release -git tag V1_9_7_M2 +git tag V1_9_8_M2 # Set new snapshot version, increasing the version number after a final release mvn versions:set -DnewVersion=1.9.8-SNAPSHOT @@ -136,7 +136,7 @@ git commit -am "Set version to 1.9.8-SNAPSHOT" git push origin # Push the release tag to GitHub -git push origin V1_9_7_M2 +git push origin V1_9_8_M2 ``` OK, the Git house-keeping is done. Now finally, let us enjoy the fruits of our work and release the staging repository -- cgit v1.2.3 From 99448ba57290ecf76384a2a778532f362399e50d Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 26 Nov 2021 09:17:21 +0100 Subject: Document bugfix #105 in release notes Signed-off-by: Alexander Kriegisch --- docs/dist/doc/README-198.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/dist/doc/README-198.html b/docs/dist/doc/README-198.html index 24abfdb95..57165e5c0 100644 --- a/docs/dist/doc/README-198.html +++ b/docs/dist/doc/README-198.html @@ -99,6 +99,11 @@

  • Document build profiles and properties in docs/developer/BUILD.md
  • Add a guide for setting up an AspectJ development environment in docs/developer/IDE.md
  • Allow JAR saving if -proceedOnError is specified
    • +
  • + Fix issue #105: Compilation fails when using an + aspect library via -aspectpath in combination with introducing an annotation via ITD. This was broken since + version 1.9.5 and fixed in 1.9.8.RC3. +

    • -- cgit v1.2.3 From d2588d086ff61d65cd90a376732ae1b9b4d646dd Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 26 Nov 2021 09:18:37 +0100 Subject: Set version to 1.9.8.RC3 Signed-off-by: Alexander Kriegisch --- ajbrowser/pom.xml | 2 +- ajde.core/pom.xml | 2 +- ajde/pom.xml | 2 +- ajdoc/pom.xml | 2 +- asm/pom.xml | 2 +- aspectjmatcher/pom.xml | 2 +- aspectjrt/pom.xml | 2 +- aspectjtools/pom.xml | 2 +- aspectjweaver/pom.xml | 2 +- bcel-builder/pom.xml | 2 +- bridge/pom.xml | 2 +- build/pom.xml | 2 +- docs/pom.xml | 2 +- installer/pom.xml | 2 +- lib/pom.xml | 2 +- loadtime/pom.xml | 2 +- org.aspectj.ajdt.core/pom.xml | 2 +- org.aspectj.matcher/pom.xml | 2 +- pom.xml | 2 +- run-all-junit-tests/pom.xml | 2 +- runtime/pom.xml | 2 +- taskdefs/pom.xml | 2 +- testing-client/pom.xml | 2 +- testing-drivers/pom.xml | 2 +- testing-util/pom.xml | 2 +- testing/pom.xml | 2 +- tests/pom.xml | 2 +- util/pom.xml | 2 +- weaver/pom.xml | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml index 97a50c606..e4890ea3f 100644 --- a/ajbrowser/pom.xml +++ b/ajbrowser/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 ajbrowser diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml index a56efdf17..15fb9b462 100644 --- a/ajde.core/pom.xml +++ b/ajde.core/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 ajde.core diff --git a/ajde/pom.xml b/ajde/pom.xml index 1e47f611f..da5599e64 100644 --- a/ajde/pom.xml +++ b/ajde/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 ajde diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml index 2c076f995..653cb5614 100644 --- a/ajdoc/pom.xml +++ b/ajdoc/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 ajdoc diff --git a/asm/pom.xml b/asm/pom.xml index 8471045b9..b6729695a 100644 --- a/asm/pom.xml +++ b/asm/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 asm diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml index 1b504f026..d48a87331 100644 --- a/aspectjmatcher/pom.xml +++ b/aspectjmatcher/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 aspectjmatcher diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml index ab8eeb8b4..e3924d860 100644 --- a/aspectjrt/pom.xml +++ b/aspectjrt/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 aspectjrt diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml index 662bfa02d..c5db42b3c 100644 --- a/aspectjtools/pom.xml +++ b/aspectjtools/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 aspectjtools diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml index 4f9dd6ecd..ce5b74a9b 100644 --- a/aspectjweaver/pom.xml +++ b/aspectjweaver/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 aspectjweaver diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml index 7137cec59..ecb8fb6a1 100644 --- a/bcel-builder/pom.xml +++ b/bcel-builder/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 bcel-builder diff --git a/bridge/pom.xml b/bridge/pom.xml index 8f47a2bcb..4fb08744b 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 bridge diff --git a/build/pom.xml b/build/pom.xml index 8112df972..886f3ce3b 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 build diff --git a/docs/pom.xml b/docs/pom.xml index db94e58e4..cbc9c49cd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 docs diff --git a/installer/pom.xml b/installer/pom.xml index db736e7d2..7a5342168 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 installer diff --git a/lib/pom.xml b/lib/pom.xml index 863e20b76..b1ddc9b81 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -7,7 +7,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 lib diff --git a/loadtime/pom.xml b/loadtime/pom.xml index ee13f90b1..73cd744af 100644 --- a/loadtime/pom.xml +++ b/loadtime/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 loadtime diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml index 87bc6d72f..c8a5e582e 100644 --- a/org.aspectj.ajdt.core/pom.xml +++ b/org.aspectj.ajdt.core/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 org.aspectj.ajdt.core diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml index 8453ad1c6..68b3fc227 100644 --- a/org.aspectj.matcher/pom.xml +++ b/org.aspectj.matcher/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 org.aspectj.matcher diff --git a/pom.xml b/pom.xml index 2a816afb2..17f55cc80 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 pom AspectJ Parent Project diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index f1bc62ffd..f56026c59 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 run-all-junit-tests diff --git a/runtime/pom.xml b/runtime/pom.xml index b410bdaa0..0fa4ebf33 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 runtime diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml index 8097fc4af..f13a31c4c 100644 --- a/taskdefs/pom.xml +++ b/taskdefs/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 taskdefs diff --git a/testing-client/pom.xml b/testing-client/pom.xml index 283787216..93549471f 100644 --- a/testing-client/pom.xml +++ b/testing-client/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 testing-client diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml index 96abef694..ce9189924 100644 --- a/testing-drivers/pom.xml +++ b/testing-drivers/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 testing-drivers diff --git a/testing-util/pom.xml b/testing-util/pom.xml index 9ae555d3b..627f272e6 100644 --- a/testing-util/pom.xml +++ b/testing-util/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 testing-util diff --git a/testing/pom.xml b/testing/pom.xml index d92ee25c4..5e2187b5d 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 testing diff --git a/tests/pom.xml b/tests/pom.xml index bd147726b..a183c86d9 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 tests diff --git a/util/pom.xml b/util/pom.xml index d16dd9821..0e1a6e4e9 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 util diff --git a/weaver/pom.xml b/weaver/pom.xml index 9513184b8..8eee82fee 100644 --- a/weaver/pom.xml +++ b/weaver/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8-SNAPSHOT + 1.9.8.RC3 weaver -- cgit v1.2.3 From 846776147b46a26b352d1d364d19d08ef48cb464 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 26 Nov 2021 09:20:41 +0100 Subject: Set version to 1.9.8-SNAPSHOT Signed-off-by: Alexander Kriegisch --- ajbrowser/pom.xml | 2 +- ajde.core/pom.xml | 2 +- ajde/pom.xml | 2 +- ajdoc/pom.xml | 2 +- asm/pom.xml | 2 +- aspectjmatcher/pom.xml | 2 +- aspectjrt/pom.xml | 2 +- aspectjtools/pom.xml | 2 +- aspectjweaver/pom.xml | 2 +- bcel-builder/pom.xml | 2 +- bridge/pom.xml | 2 +- build/pom.xml | 2 +- docs/pom.xml | 2 +- installer/pom.xml | 2 +- lib/pom.xml | 2 +- loadtime/pom.xml | 2 +- org.aspectj.ajdt.core/pom.xml | 2 +- org.aspectj.matcher/pom.xml | 2 +- pom.xml | 2 +- run-all-junit-tests/pom.xml | 2 +- runtime/pom.xml | 2 +- taskdefs/pom.xml | 2 +- testing-client/pom.xml | 2 +- testing-drivers/pom.xml | 2 +- testing-util/pom.xml | 2 +- testing/pom.xml | 2 +- tests/pom.xml | 2 +- util/pom.xml | 2 +- weaver/pom.xml | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml index e4890ea3f..97a50c606 100644 --- a/ajbrowser/pom.xml +++ b/ajbrowser/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT ajbrowser diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml index 15fb9b462..a56efdf17 100644 --- a/ajde.core/pom.xml +++ b/ajde.core/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT ajde.core diff --git a/ajde/pom.xml b/ajde/pom.xml index da5599e64..1e47f611f 100644 --- a/ajde/pom.xml +++ b/ajde/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT ajde diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml index 653cb5614..2c076f995 100644 --- a/ajdoc/pom.xml +++ b/ajdoc/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT ajdoc diff --git a/asm/pom.xml b/asm/pom.xml index b6729695a..8471045b9 100644 --- a/asm/pom.xml +++ b/asm/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT asm diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml index d48a87331..1b504f026 100644 --- a/aspectjmatcher/pom.xml +++ b/aspectjmatcher/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT aspectjmatcher diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml index e3924d860..ab8eeb8b4 100644 --- a/aspectjrt/pom.xml +++ b/aspectjrt/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT aspectjrt diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml index c5db42b3c..662bfa02d 100644 --- a/aspectjtools/pom.xml +++ b/aspectjtools/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT aspectjtools diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml index ce5b74a9b..4f9dd6ecd 100644 --- a/aspectjweaver/pom.xml +++ b/aspectjweaver/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT aspectjweaver diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml index ecb8fb6a1..7137cec59 100644 --- a/bcel-builder/pom.xml +++ b/bcel-builder/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT bcel-builder diff --git a/bridge/pom.xml b/bridge/pom.xml index 4fb08744b..8f47a2bcb 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT bridge diff --git a/build/pom.xml b/build/pom.xml index 886f3ce3b..8112df972 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT build diff --git a/docs/pom.xml b/docs/pom.xml index cbc9c49cd..db94e58e4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT docs diff --git a/installer/pom.xml b/installer/pom.xml index 7a5342168..db736e7d2 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT installer diff --git a/lib/pom.xml b/lib/pom.xml index b1ddc9b81..863e20b76 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -7,7 +7,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT lib diff --git a/loadtime/pom.xml b/loadtime/pom.xml index 73cd744af..ee13f90b1 100644 --- a/loadtime/pom.xml +++ b/loadtime/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT loadtime diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml index c8a5e582e..87bc6d72f 100644 --- a/org.aspectj.ajdt.core/pom.xml +++ b/org.aspectj.ajdt.core/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT org.aspectj.ajdt.core diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml index 68b3fc227..8453ad1c6 100644 --- a/org.aspectj.matcher/pom.xml +++ b/org.aspectj.matcher/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT org.aspectj.matcher diff --git a/pom.xml b/pom.xml index 17f55cc80..2a816afb2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT pom AspectJ Parent Project diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index f56026c59..f1bc62ffd 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT run-all-junit-tests diff --git a/runtime/pom.xml b/runtime/pom.xml index 0fa4ebf33..b410bdaa0 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT runtime diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml index f13a31c4c..8097fc4af 100644 --- a/taskdefs/pom.xml +++ b/taskdefs/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT taskdefs diff --git a/testing-client/pom.xml b/testing-client/pom.xml index 93549471f..283787216 100644 --- a/testing-client/pom.xml +++ b/testing-client/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT testing-client diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml index ce9189924..96abef694 100644 --- a/testing-drivers/pom.xml +++ b/testing-drivers/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT testing-drivers diff --git a/testing-util/pom.xml b/testing-util/pom.xml index 627f272e6..9ae555d3b 100644 --- a/testing-util/pom.xml +++ b/testing-util/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT testing-util diff --git a/testing/pom.xml b/testing/pom.xml index 5e2187b5d..d92ee25c4 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT testing diff --git a/tests/pom.xml b/tests/pom.xml index a183c86d9..bd147726b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT tests diff --git a/util/pom.xml b/util/pom.xml index 0e1a6e4e9..d16dd9821 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT util diff --git a/weaver/pom.xml b/weaver/pom.xml index 8eee82fee..9513184b8 100644 --- a/weaver/pom.xml +++ b/weaver/pom.xml @@ -6,7 +6,7 @@ org.aspectj aspectj-parent - 1.9.8.RC3 + 1.9.8-SNAPSHOT weaver -- cgit v1.2.3 From 2544ad77d9ec7751ca298b4a09848487305a27d3 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 26 Nov 2021 10:24:44 +0100 Subject: Add forgotten Bugs198Tests to test suite Signed-off-by: Alexander Kriegisch --- .../test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java | 1 + tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java index 69ed09593..4aac84810 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java @@ -18,6 +18,7 @@ public class AllTestsAspectJ198 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ 1.9.8 tests"); + suite.addTest(Bugs198Tests.suite()); if (LangUtil.is9VMOrGreater()) { suite.addTest(CompileWithReleaseTests.suite()); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java index 69d484590..d8e57b534 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java @@ -7,6 +7,7 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc198; +import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; /** @@ -18,6 +19,10 @@ public class Bugs198Tests extends XMLBasedAjcTestCase { runTest("ITD annotation with mandatory parameter via aspectpath"); } + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Bugs198Tests.class); + } + @Override protected java.net.URL getSpecFile() { return getClassResource("ajc198.xml"); -- cgit v1.2.3