Switch to Tycho-less build again

basilevs · Feb 24, 2024 · e24f5cd · e24f5cd
1 parent c4c78b9
commit e24f5cd
Show file tree

Hide file tree

Showing 38 changed files with 256 additions and 142 deletions.
diff --git a/build/launch/Maven clean.launch b/build/launch/Maven clean.launch
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+    <stringAttribute key="bad_container_name" value="/org.basilevs.jstackfilter.build/launch"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/opt/homebrew/bin/mvn"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-f ${workspace_loc:/org.basilevs.jstackfilter.build/pom.xml}&#10;clean"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.basilevs.jstackfilter.build}/.."/>
+</launchConfiguration>
diff --git a/build/launch/Maven install.launch b/build/launch/Maven install.launch
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+    <stringAttribute key="bad_container_name" value="/org.basilevs.jstackfilter.build/launch"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/opt/homebrew/bin/mvn"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-f ${workspace_loc:/org.basilevs.jstackfilter.build/pom.xml}&#10;clean&#10;install"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.basilevs.jstackfilter.build}/.."/>
+</launchConfiguration>
diff --git a/build/launch/Maven build.launch → build/launch/Maven verify.launch b/build/launch/Maven build.launch → build/launch/Maven verify.launch
diff --git a/core/core/.project b/core/core/.project
@@ -11,19 +11,14 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 	<filteredResources>
 		<filter>

diff --git a/core/core/.settings/org.eclipse.jdt.core.prefs b/core/core/.settings/org.eclipse.jdt.core.prefs
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -115,4 +115,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 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
diff --git a/core/core/build.properties b/core/core/build.properties
diff --git a/core/core/launch/ExternalJstack.launch b/core/core/launch/ExternalJstack.launch
@@ -14,6 +14,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.basilevs.jstackfilter.process.ExternalJstack"/>
     <listAttribute key="org.eclipse.jdt.launching.MODULEPATH">
@@ -23,4 +24,5 @@
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.basilevs.jstackfilter"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="93033"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.basilevs.jstackfilter"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
diff --git a/core/core/launch/File.launch b/core/core/launch/File.launch
@@ -12,8 +12,10 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.basilevs.jstackfilter.process.File"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.basilevs.jstackfilter"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="/tmp/jstack.txt"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.basilevs.jstackfilter"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
diff --git a/core/core/launch/Input.launch b/core/core/launch/Input.launch
@@ -14,6 +14,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.basilevs.jstackfilter.process.Input"/>
     <listAttribute key="org.eclipse.jdt.launching.MODULEPATH">
@@ -22,4 +23,5 @@
     </listAttribute>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.basilevs.jstackfilter"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.basilevs.jstackfilter"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
diff --git a/core/core/pom.xml b/core/core/pom.xml
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.basilevs.jstackfilter</groupId>
+		<artifactId>core-parent</artifactId>
+		<version>${revision}</version>
+	</parent>
+	<artifactId>org.basilevs.jstackfilter</artifactId>
+	<packaging>jar</packaging>
+
+
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*.txt</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.3.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>org.basilevs.jstackfilter.process.Input</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>  
diff --git a/core/pom.xml b/core/pom.xml
@@ -7,6 +7,7 @@
 		<groupId>org.basilevs.jstackfilter</groupId>
 		<artifactId>parent</artifactId>
 		<version>${revision}</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>core-parent</artifactId>
 	<packaging>pom</packaging>

diff --git a/core/test/.classpath b/core/test/.classpath
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry including="**/*.java" kind="src" output="target_test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.basilevs.jstackfilter">
 		<attributes>
 			<attribute name="module" value="true"/>
@@ -9,12 +15,13 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target_classes"/>
 </classpath>
diff --git a/core/test/.gitignore b/core/test/.gitignore
@@ -1,2 +1,3 @@
 /1.txt
 /2.txt
+/target_test-classes/
diff --git a/core/test/.project b/core/test/.project
@@ -12,20 +12,22 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>target_classes</name>
+			<type>2</type>
+			<location>//Users/vasiligulevich/git/jstackfilter/core/test/target/classes/</location>
+		</link>
+	</linkedResources>
 	<filteredResources>
 		<filter>
 			<id>1707321526421</id>

diff --git a/core/test/.settings/org.eclipse.core.resources.prefs b/core/test/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +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/core/test/.settings/org.eclipse.jdt.core.prefs b/core/test/.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.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
@@ -10,6 +10,7 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=17
diff --git a/core/test/.settings/org.eclipse.m2e.core.prefs b/core/test/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/core/test/build.properties b/core/test/build.properties
diff --git a/core/test/launch/Tests.launch b/core/test/launch/Tests.launch
diff --git a/core/test/pom.xml b/core/test/pom.xml
@@ -0,0 +1,42 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.basilevs.jstackfilter</groupId>
+		<artifactId>core-parent</artifactId>
+		<version>${revision}</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.basilevs.jstackfilter.test</artifactId>
+	<packaging>jar</packaging>
+
+
+	<build>
+		<testResources>
+			<testResource>
+				<directory>src/test/java</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*.txt</include>
+				</includes>
+			</testResource>
+		</testResources>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.basilevs.jstackfilter</groupId>
+			<artifactId>org.basilevs.jstackfilter</artifactId>
+			<version>${revision}</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/junit/junit -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.2</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>  
diff --git a/core/test/src/main/java/module-info.java b/core/test/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module org.basilevs.jstackfilter.test {
+	requires org.basilevs.jstackfilter;
+}
diff --git a/core/test/src/test/java/module-info.java b/core/test/src/test/java/module-info.java
@@ -0,0 +1,5 @@
+module org.basilevs.jstackfilter.test {
+	requires org.basilevs.jstackfilter;
+	requires transitive junit;
+	exports org.basilevs.jstackfilter.test;
+}
diff --git a/core/test/CompletionEngine.txt → ...vs/jstackfilter/test/CompletionEngine.txt b/core/test/CompletionEngine.txt → ...vs/jstackfilter/test/CompletionEngine.txt
diff --git a/core/test/src/test/java/org/basilevs/jstackfilter/test/FilterTest.java b/core/test/src/test/java/org/basilevs/jstackfilter/test/FilterTest.java
@@ -1,7 +1,6 @@
 package org.basilevs.jstackfilter.test;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.StringReader;
 
 import org.basilevs.jstackfilter.Filter;

diff --git a/core/test/src/test/java/org/basilevs/jstackfilter/test/ThreadRegistryTest.java b/core/test/src/test/java/org/basilevs/jstackfilter/test/ThreadRegistryTest.java
@@ -1,10 +1,7 @@
 package org.basilevs.jstackfilter.test;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;

diff --git a/core/test/jdk_hang.txt → ...g/basilevs/jstackfilter/test/jdk_hang.txt b/core/test/jdk_hang.txt → ...g/basilevs/jstackfilter/test/jdk_hang.txt
diff --git a/core/test/test.txt → ...a/org/basilevs/jstackfilter/test/test.txt b/core/test/test.txt → ...a/org/basilevs/jstackfilter/test/test.txt
diff --git a/eclipse/feature/.project b/eclipse/feature/.project
@@ -3,6 +3,7 @@
 	<name>org.basilevs.jstackfilter.eclipse.feature</name>
 	<comment></comment>
 	<projects>
+		<project>org.basilevs.jstackfilter.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

diff --git a/eclipse/feature/default.target b/eclipse/feature/default.target