From 7758d629f9bc6818709d5ae97bbb98a27c908f75 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Fri, 25 Jan 2019 15:08:21 -0800
Subject: [PATCH] tweak matcher for weaver module requirements

---
 org.aspectj.matcher/pom.xml                    | 18 ++++++++++++++++++
 .../org/aspectj/weaver/ResolvedMemberImpl.java |  3 ++-
 .../org/aspectj/weaver/XlintDefault.properties |  0
 .../aspectj/weaver/weaver-messages.properties  |  0
 4 files changed, 20 insertions(+), 1 deletion(-)
 rename org.aspectj.matcher/src/main/{java => resources}/org/aspectj/weaver/XlintDefault.properties (100%)
 rename org.aspectj.matcher/src/main/{java => resources}/org/aspectj/weaver/weaver-messages.properties (100%)

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
similarity index 100%
rename from org.aspectj.matcher/src/main/java/org/aspectj/weaver/XlintDefault.properties
rename to 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
similarity index 100%
rename from org.aspectj.matcher/src/main/java/org/aspectj/weaver/weaver-messages.properties
rename to org.aspectj.matcher/src/main/resources/org/aspectj/weaver/weaver-messages.properties
-- 
2.39.5