diff options
author | Andy Clement <aclement@pivotal.io> | 2019-01-25 15:08:21 -0800 |
---|---|---|
committer | Andy Clement <aclement@pivotal.io> | 2019-01-25 15:08:21 -0800 |
commit | 7758d629f9bc6818709d5ae97bbb98a27c908f75 (patch) | |
tree | d67ee1f6a76adb58f006590e3a9c4cc2c882e996 | |
parent | 9659cfe976a424a20e7b840152a13d266e794226 (diff) | |
download | aspectj-7758d629f9bc6818709d5ae97bbb98a27c908f75.tar.gz aspectj-7758d629f9bc6818709d5ae97bbb98a27c908f75.zip |
tweak matcher for weaver module requirements
-rw-r--r-- | org.aspectj.matcher/pom.xml | 18 | ||||
-rw-r--r-- | org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java | 3 | ||||
-rw-r--r-- | org.aspectj.matcher/src/main/resources/org/aspectj/weaver/XlintDefault.properties (renamed from org.aspectj.matcher/src/main/java/org/aspectj/weaver/XlintDefault.properties) | 0 | ||||
-rw-r--r-- | org.aspectj.matcher/src/main/resources/org/aspectj/weaver/weaver-messages.properties (renamed from org.aspectj.matcher/src/main/java/org/aspectj/weaver/weaver-messages.properties) | 0 |
4 files changed, 20 insertions, 1 deletions
diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml index 4e67ef7f9..e3f8a9627 100644 --- a/org.aspectj.matcher/pom.xml +++ b/org.aspectj.matcher/pom.xml @@ -39,4 +39,22 @@ </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java index cfd0508c4..84e382422 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -124,7 +125,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso List<ResolvedType> declaringTypes = new ArrayList<ResolvedType>(); accumulateTypesInBetween(originalDeclaringType, firstDefiningType, declaringTypes); - Set<ResolvedMember> memberSignatures = new HashSet<ResolvedMember>(); + Set<ResolvedMember> memberSignatures = new LinkedHashSet<ResolvedMember>(); for (ResolvedType declaringType : declaringTypes) { memberSignatures.add(new JoinPointSignature(firstDefiningMember, declaringType)); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/XlintDefault.properties b/org.aspectj.matcher/src/main/resources/org/aspectj/weaver/XlintDefault.properties index 416fc2d55..416fc2d55 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/XlintDefault.properties +++ b/org.aspectj.matcher/src/main/resources/org/aspectj/weaver/XlintDefault.properties diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/weaver-messages.properties b/org.aspectj.matcher/src/main/resources/org/aspectj/weaver/weaver-messages.properties index 2745ae9e7..2745ae9e7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/weaver-messages.properties +++ b/org.aspectj.matcher/src/main/resources/org/aspectj/weaver/weaver-messages.properties |