use target/lib,target/classes - remove version from jars

nbauma109 · May 9, 2024 · d9b0ef1 · d9b0ef1
1 parent 54af775
commit d9b0ef1
Show file tree

Hide file tree

Showing 29 changed files with 121 additions and 81 deletions.
diff --git a/org.sf.feeling.decompiler.cfr/.classpath b/org.sf.feeling.decompiler.cfr/.classpath
@@ -6,8 +6,8 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/cfr-0.152.jar"/>
-	<classpathentry kind="src" output="bin" path="src">
+	<classpathentry exported="true" kind="lib" path="target/lib/cfr.jar"/>
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -18,5 +18,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.sf.feeling.decompiler.cfr/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.cfr/META-INF/MANIFEST.MF
@@ -26,6 +26,6 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: ECD Project Team
 Export-Package: org.sf.feeling.decompiler.cfr.actions,
  org.sf.feeling.decompiler.cfr.decompiler
-Bundle-ClassPath: lib/cfr-0.152.jar,
+Bundle-ClassPath: target/lib/cfr.jar,
  .
 Automatic-Module-Name: org.sf.feeling.decompiler.cfr
diff --git a/org.sf.feeling.decompiler.cfr/build.properties b/org.sf.feeling.decompiler.cfr/build.properties
@@ -1,7 +1,7 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               lib/cfr-0.152.jar
+               target/lib/
diff --git a/org.sf.feeling.decompiler.cfr/pom.xml b/org.sf.feeling.decompiler.cfr/pom.xml
@@ -37,7 +37,8 @@
 									<groupId>org.benf</groupId>
 									<artifactId>cfr</artifactId>
 									<overWrite>true</overWrite>
-									<outputDirectory>lib</outputDirectory>
+									<outputDirectory>target/lib</outputDirectory>
+									<destFileName>cfr.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>

diff --git a/org.sf.feeling.decompiler.jd/.classpath b/org.sf.feeling.decompiler.jd/.classpath
@@ -6,21 +6,21 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" output="bin" path="src">
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/bcel-6.7.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.12.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.16.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jd-util-1.1.16.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jd-core-1.2.26.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/lib/bcel.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/lib/commons-lang3.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/lib/commons-io.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/lib/jd-util.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/lib/jd-core.jar"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.sf.feeling.decompiler.jd/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.jd/META-INF/MANIFEST.MF
@@ -27,9 +27,9 @@ Bundle-Vendor: ECD Project Team
 Export-Package: org.sf.feeling.decompiler.jd.actions,
  org.sf.feeling.decompiler.jd.decompiler
 Bundle-ClassPath: .,
- lib/bcel-6.7.0.jar,
- lib/commons-lang3-3.12.0.jar,
- lib/commons-io-2.16.1.jar,
- lib/jd-util-1.1.16.jar,
- lib/jd-core-1.2.26.jar
+ target/lib/bcel.jar,
+ target/lib/commons-lang3.jar,
+ target/lib/commons-io.jar,
+ target/lib/jd-util.jar,
+ target/lib/jd-core.jar
 Automatic-Module-Name: org.sf.feeling.decompiler.jd
diff --git a/org.sf.feeling.decompiler.jd/build.properties b/org.sf.feeling.decompiler.jd/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                lib/,\

diff --git a/org.sf.feeling.decompiler.jd/pom.xml b/org.sf.feeling.decompiler.jd/pom.xml
@@ -34,36 +34,37 @@
 							<goal>copy</goal>
 						</goals>
 						<configuration>
+							<outputDirectory>target/lib</outputDirectory>
 							<artifactItems>
 								<artifactItem>
 									<groupId>commons-io</groupId>
 									<artifactId>commons-io</artifactId>
 									<overWrite>true</overWrite>
-									<outputDirectory>lib</outputDirectory>
+									<destFileName>commons-io.jar</destFileName>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.commons</groupId>
 									<artifactId>commons-lang3</artifactId>
 									<overWrite>true</overWrite>
-									<outputDirectory>lib</outputDirectory>
+									<destFileName>commons-lang3.jar</destFileName>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.bcel</groupId>
 									<artifactId>bcel</artifactId>
 									<overWrite>true</overWrite>
-									<outputDirectory>lib</outputDirectory>
+									<destFileName>bcel.jar</destFileName>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.github.nbauma109</groupId>
 									<artifactId>jd-util</artifactId>
 									<overWrite>true</overWrite>
-									<outputDirectory>lib</outputDirectory>
+									<destFileName>jd-util.jar</destFileName>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.github.nbauma109</groupId>
 									<artifactId>jd-core</artifactId>
 									<overWrite>true</overWrite>
-									<outputDirectory>lib</outputDirectory>
+									<destFileName>jd-core.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>

diff --git a/org.sf.feeling.decompiler.procyon/.classpath b/org.sf.feeling.decompiler.procyon/.classpath
@@ -6,9 +6,9 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/procyon-core-0.6.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/procyon-compilertools-0.6.0.jar"/>
-	<classpathentry kind="src" output="bin" path="src">
+	<classpathentry exported="true" kind="lib" path="lib/procyon-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/procyon-compilertools.jar"/>
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -19,5 +19,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.sf.feeling.decompiler.procyon/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.procyon/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: ECD Project Team
 Export-Package: org.sf.feeling.decompiler.procyon.actions,
  org.sf.feeling.decompiler.procyon.decompiler
-Bundle-ClassPath: lib/procyon-core-0.6.0.jar,
- lib/procyon-compilertools-0.6.0.jar,
+Bundle-ClassPath: lib/procyon-core.jar,
+ lib/procyon-compilertools.jar,
  .
 Automatic-Module-Name: org.sf.feeling.decompiler.procyon
diff --git a/org.sf.feeling.decompiler.procyon/build.properties b/org.sf.feeling.decompiler.procyon/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                lib/,\

diff --git a/org.sf.feeling.decompiler.procyon/pom.xml b/org.sf.feeling.decompiler.procyon/pom.xml
@@ -32,18 +32,19 @@
 							<goal>copy</goal>
 						</goals>
 						<configuration>
+							<outputDirectory>target/lib</outputDirectory>
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.bitbucket.mstrobel</groupId>
 									<artifactId>procyon-compilertools</artifactId>
 									<overWrite>true</overWrite>
-									<outputDirectory>lib</outputDirectory>
+									<destFileName>procyon-compilertools.jar</destFileName>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.bitbucket.mstrobel</groupId>
 									<artifactId>procyon-core</artifactId>
 									<overWrite>true</overWrite>
-									<outputDirectory>lib</outputDirectory>
+									<destFileName>procyon-core.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>

diff --git a/org.sf.feeling.decompiler.source.attach.tests/.classpath b/org.sf.feeling.decompiler.source.attach.tests/.classpath
@@ -6,8 +6,8 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="target/lib/commons-io-2.16.1.jar"/>
-	<classpathentry kind="src" output="bin" path="src">
+	<classpathentry exported="true" kind="lib" path="target/lib/commons-io.jar"/>
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -18,5 +18,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.sf.feeling.decompiler.source.attach.tests/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.source.attach.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: Enhanced Class Decompiler Source Attach
 Bundle-SymbolicName: org.sf.feeling.decompiler.source.attach.tests;singleton:=true
 Bundle-Version: 2024.3.1
 Bundle-Activator: org.sf.feeling.decompiler.source.attach.SourceAttachPlugin
-Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.expressions,
@@ -27,6 +26,6 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: ECD Project Team
-Bundle-ClassPath: target/lib/commons-io-2.16.1.jar,
+Bundle-ClassPath: target/lib/commons-io.jar,
  .
 Automatic-Module-Name: org.sf.feeling.decompiler.source.attach.tests
diff --git a/org.sf.feeling.decompiler.source.attach.tests/build.properties b/org.sf.feeling.decompiler.source.attach.tests/build.properties
@@ -1,6 +1,6 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               target/lib/,\
+               target/lib/
 
diff --git a/org.sf.feeling.decompiler.source.attach.tests/pom.xml b/org.sf.feeling.decompiler.source.attach.tests/pom.xml
@@ -13,4 +13,41 @@
 	<artifactId>org.sf.feeling.decompiler.source.attach.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.6.1</version>
+				<executions>
+					<execution>
+						<id>copy</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/lib</outputDirectory>
+							<artifactItems>
+								<artifactItem>
+									<groupId>commons-io</groupId>
+									<artifactId>commons-io</artifactId>
+									<overWrite>true</overWrite>
+									<destFileName>commons-io.jar</destFileName>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+	</dependencies>
+
 </project>
diff --git a/org.sf.feeling.decompiler.source.attach/.classpath b/org.sf.feeling.decompiler.source.attach/.classpath
@@ -6,8 +6,8 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="target/lib/commons-io-2.16.1.jar"/>
-	<classpathentry kind="src" output="bin" path="src">
+	<classpathentry exported="true" kind="lib" path="target/lib/commons-io.jar"/>
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -18,5 +18,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: ECD Project Team
-Bundle-ClassPath: target/lib/commons-io-2.16.1.jar,
+Bundle-ClassPath: target/lib/commons-io.jar,
  .
 Export-Package: org.sf.feeling.decompiler.source.attach,
  org.sf.feeling.decompiler.source.attach.attacher,

diff --git a/org.sf.feeling.decompiler.source.attach/build.properties b/org.sf.feeling.decompiler.source.attach/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\

diff --git a/org.sf.feeling.decompiler.source.attach/pom.xml b/org.sf.feeling.decompiler.source.attach/pom.xml
@@ -33,6 +33,7 @@
 									<groupId>commons-io</groupId>
 									<artifactId>commons-io</artifactId>
 									<overWrite>true</overWrite>
+									<destFileName>commons-io.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
@@ -42,7 +43,6 @@
 		</plugins>
 	</build>
 
-
 	<dependencies>
 		<dependency>
 			<groupId>commons-io</groupId>

diff --git a/org.sf.feeling.decompiler.vineflower/.classpath b/org.sf.feeling.decompiler.vineflower/.classpath
@@ -6,17 +6,17 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" output="bin" path="src">
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/vineflower-1.10.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/lib/vineflower.jar"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.jdt.core.prefs b/org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -77,7 +77,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

diff --git a/org.sf.feeling.decompiler.vineflower/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.vineflower/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.sf.feeling.decompiler.vineflower
 Bundle-Name: Enhanced Class Decompiler Vineflower Extension
 Bundle-SymbolicName: org.sf.feeling.decompiler.vineflower;singleton:=true
 Bundle-Version: 2024.3.1
@@ -21,10 +22,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.navigator,
  org.eclipse.ui.ide;resolution:=optional,
  org.eclipse.core.filesystem
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: ECD Project Team
 Export-Package: org.sf.feeling.decompiler.vineflower.actions,
  org.sf.feeling.decompiler.vineflower.decompiler
 Bundle-ClassPath: .,
- lib/vineflower-1.10.0.jar
+ target/lib/vineflower.jar