From b30dde96344652cf514342b0ca597e37fe9181a0 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Fri, 25 Jan 2019 15:18:12 -0800
Subject: [PATCH] fix pom version and minor improvement to classpath calc

---
 bcel-builder/.classpath                       | 44 +++++++++++++++++++
 bcel-builder/.project                         | 23 ++++++++++
 .../org.eclipse.core.resources.prefs          |  4 ++
 .../.settings/org.eclipse.jdt.apt.core.prefs  |  2 +
 .../.settings/org.eclipse.jdt.core.prefs      |  7 +++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 bcel-builder/pom.xml                          |  2 +-
 .../aspectj/apache/bcel/util/ClassPath.java   |  2 +-
 8 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 bcel-builder/.classpath
 create mode 100644 bcel-builder/.project
 create mode 100644 bcel-builder/.settings/org.eclipse.core.resources.prefs
 create mode 100644 bcel-builder/.settings/org.eclipse.jdt.apt.core.prefs
 create mode 100644 bcel-builder/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 bcel-builder/.settings/org.eclipse.m2e.core.prefs

diff --git a/bcel-builder/.classpath b/bcel-builder/.classpath
new file mode 100644
index 000000000..f0257c5a5
--- /dev/null
+++ b/bcel-builder/.classpath
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bcel-builder/.project b/bcel-builder/.project
new file mode 100644
index 000000000..454e221b1
--- /dev/null
+++ b/bcel-builder/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bcel-builder</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bcel-builder/.settings/org.eclipse.core.resources.prefs b/bcel-builder/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..f9fe34593
--- /dev/null
+++ b/bcel-builder/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/bcel-builder/.settings/org.eclipse.jdt.apt.core.prefs b/bcel-builder/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 000000000..d4313d4b2
--- /dev/null
+++ b/bcel-builder/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/bcel-builder/.settings/org.eclipse.jdt.core.prefs b/bcel-builder/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..5592a0a1c
--- /dev/null
+++ b/bcel-builder/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/bcel-builder/.settings/org.eclipse.m2e.core.prefs b/bcel-builder/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/bcel-builder/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml
index 58dcd27c5..0e9a907b6 100644
--- a/bcel-builder/pom.xml
+++ b/bcel-builder/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.aspectj</groupId>
 		<artifactId>aspectj-parent</artifactId>
-    <version>${revision}</version>
+    <version>1.9.3.BUILD-SNAPSHOT</version>
     <relativePath>..</relativePath>
 	</parent>
 
diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java
index b7db332d2..a66e9c58a 100644
--- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java
+++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java
@@ -213,7 +213,7 @@ public class ClassPath implements Serializable {
 
 			if (extensions != null)
 				for (int i = 0; i < extensions.length; i++)
-					list.add(ext_path + File.separatorChar + extensions[i]);
+					list.add(ext_dir.toString() + File.separatorChar + extensions[i]);
 		}
 
 		StringBuffer buf = new StringBuffer();
-- 
2.39.5