From e24f5cdf491a69a8d75889d21b129bc13829be61 Mon Sep 17 00:00:00 2001 From: Vasili Gulevich Date: Sat, 24 Feb 2024 22:34:06 +0400 Subject: [PATCH] Switch to Tycho-less build again --- build/launch/Maven clean.launch | 8 ++++ build/launch/Maven install.launch | 8 ++++ ...Maven build.launch => Maven verify.launch} | 0 core/core/.project | 9 +--- .../core/.settings/org.eclipse.jdt.core.prefs | 6 +-- core/core/build.properties | 4 -- core/core/launch/ExternalJstack.launch | 2 + core/core/launch/File.launch | 2 + core/core/launch/Input.launch | 2 + core/core/pom.xml | 40 ++++++++++++++++ core/pom.xml | 1 + core/test/.classpath | 13 +++-- core/test/.gitignore | 1 + core/test/.project | 16 ++++--- .../org.eclipse.core.resources.prefs | 2 + .../test/.settings/org.eclipse.jdt.core.prefs | 7 +-- .../test/.settings/org.eclipse.m2e.core.prefs | 4 ++ core/test/build.properties | 4 -- core/test/launch/Tests.launch | 47 ------------------- core/test/pom.xml | 42 +++++++++++++++++ core/test/src/main/java/module-info.java | 3 ++ core/test/src/test/java/module-info.java | 5 ++ .../jstackfilter/test}/CompletionEngine.txt | 0 .../jstackfilter/test/FilterTest.java | 1 - .../jstackfilter/test/ThreadRegistryTest.java | 3 -- .../basilevs/jstackfilter/test}/jdk_hang.txt | 0 .../org/basilevs/jstackfilter/test}/test.txt | 0 eclipse/feature/.project | 1 + eclipse/feature/default.target | 11 ----- eclipse/plugin/.project | 1 + eclipse/plugin/META-INF/MANIFEST.MF | 4 +- eclipse/pom.xml | 46 ++++++++++++++++++ eclipse/repository/.project | 1 + eclipse/target-definition/.project | 11 +++++ .../org.eclipse.core.resources.prefs | 2 + eclipse/target-definition/pom.xml | 14 ++++++ .../target-definition.target | 30 ++++++++++++ pom.xml | 47 ------------------- 38 files changed, 256 insertions(+), 142 deletions(-) create mode 100644 build/launch/Maven clean.launch create mode 100644 build/launch/Maven install.launch rename build/launch/{Maven build.launch => Maven verify.launch} (100%) delete mode 100644 core/core/build.properties create mode 100644 core/core/pom.xml create mode 100644 core/test/.settings/org.eclipse.m2e.core.prefs delete mode 100644 core/test/build.properties delete mode 100644 core/test/launch/Tests.launch create mode 100644 core/test/pom.xml create mode 100644 core/test/src/main/java/module-info.java create mode 100644 core/test/src/test/java/module-info.java rename core/test/{ => src/test/java/org/basilevs/jstackfilter/test}/CompletionEngine.txt (100%) rename core/test/{ => src/test/java/org/basilevs/jstackfilter/test}/jdk_hang.txt (100%) rename core/test/{ => src/test/java/org/basilevs/jstackfilter/test}/test.txt (100%) delete mode 100644 eclipse/feature/default.target create mode 100644 eclipse/target-definition/.project create mode 100644 eclipse/target-definition/.settings/org.eclipse.core.resources.prefs create mode 100644 eclipse/target-definition/pom.xml create mode 100644 eclipse/target-definition/target-definition.target diff --git a/build/launch/Maven clean.launch b/build/launch/Maven clean.launch new file mode 100644 index 0000000..128314f --- /dev/null +++ b/build/launch/Maven clean.launch @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/build/launch/Maven install.launch b/build/launch/Maven install.launch new file mode 100644 index 0000000..138f0fa --- /dev/null +++ b/build/launch/Maven install.launch @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/build/launch/Maven build.launch b/build/launch/Maven verify.launch similarity index 100% rename from build/launch/Maven build.launch rename to build/launch/Maven verify.launch diff --git a/core/core/.project b/core/core/.project index 5a1469a..c647f2b 100644 --- a/core/core/.project +++ b/core/core/.project @@ -11,19 +11,14 @@ - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder + org.eclipse.m2e.core.maven2Builder org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature + org.eclipse.m2e.core.maven2Nature diff --git a/core/core/.settings/org.eclipse.jdt.core.prefs b/core/core/.settings/org.eclipse.jdt.core.prefs index f9e8b31..50cc44c 100644 --- 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 deleted file mode 100644 index ead7cf6..0000000 --- a/core/core/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/main/java/ -bin.includes = META-INF/,\ - . -jre.compilation.profile = JavaSE-17 diff --git a/core/core/launch/ExternalJstack.launch b/core/core/launch/ExternalJstack.launch index f88275c..3120179 100644 --- a/core/core/launch/ExternalJstack.launch +++ b/core/core/launch/ExternalJstack.launch @@ -14,6 +14,7 @@ + @@ -23,4 +24,5 @@ + diff --git a/core/core/launch/File.launch b/core/core/launch/File.launch index 10bdce6..4d7fd61 100644 --- a/core/core/launch/File.launch +++ b/core/core/launch/File.launch @@ -12,8 +12,10 @@ + + diff --git a/core/core/launch/Input.launch b/core/core/launch/Input.launch index b6b15a0..e6e4e8f 100644 --- a/core/core/launch/Input.launch +++ b/core/core/launch/Input.launch @@ -14,6 +14,7 @@ + @@ -22,4 +23,5 @@ + diff --git a/core/core/pom.xml b/core/core/pom.xml new file mode 100644 index 0000000..59a2dc2 --- /dev/null +++ b/core/core/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + org.basilevs.jstackfilter + core-parent + ${revision} + + org.basilevs.jstackfilter + jar + + + + + + src/main/java + false + + **/*.txt + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + org.basilevs.jstackfilter.process.Input + + + + + + + \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index c374dc3..f9da9f8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,6 +7,7 @@ org.basilevs.jstackfilter parent ${revision} + .. core-parent pom diff --git a/core/test/.classpath b/core/test/.classpath index ccad5cc..20f40a0 100644 --- a/core/test/.classpath +++ b/core/test/.classpath @@ -1,6 +1,12 @@ - + + + + + + + @@ -9,12 +15,13 @@ + - + - + diff --git a/core/test/.gitignore b/core/test/.gitignore index 261a305..0e6158d 100644 --- 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 index df1f360..a921440 100644 --- a/core/test/.project +++ b/core/test/.project @@ -12,20 +12,22 @@ - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder + org.eclipse.m2e.core.maven2Builder + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature + + + target_classes + 2 + //Users/vasiligulevich/git/jstackfilter/core/test/target/classes/ + + 1707321526421 diff --git a/core/test/.settings/org.eclipse.core.resources.prefs b/core/test/.settings/org.eclipse.core.resources.prefs index 99f26c0..f9fe345 100644 --- 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/=UTF-8 diff --git a/core/test/.settings/org.eclipse.jdt.core.prefs b/core/test/.settings/org.eclipse.jdt.core.prefs index f68c0a2..af7ce86 100644 --- 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 new file mode 100644 index 0000000..f897a7f --- /dev/null +++ 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 deleted file mode 100644 index f1b19ff..0000000 --- a/core/test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/test/java/ -bin.includes = META-INF/,\ - . -jre.compilation.profile = JavaSE-17 diff --git a/core/test/launch/Tests.launch b/core/test/launch/Tests.launch deleted file mode 100644 index 99ac071..0000000 --- a/core/test/launch/Tests.launch +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/test/pom.xml b/core/test/pom.xml new file mode 100644 index 0000000..1d59830 --- /dev/null +++ b/core/test/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + org.basilevs.jstackfilter + core-parent + ${revision} + .. + + org.basilevs.jstackfilter.test + jar + + + + + + src/test/java + false + + **/*.txt + + + + + + + + org.basilevs.jstackfilter + org.basilevs.jstackfilter + ${revision} + + + + junit + junit + 4.13.2 + test + + + \ No newline at end of file diff --git a/core/test/src/main/java/module-info.java b/core/test/src/main/java/module-info.java new file mode 100644 index 0000000..1c9eee0 --- /dev/null +++ b/core/test/src/main/java/module-info.java @@ -0,0 +1,3 @@ +module org.basilevs.jstackfilter.test { + requires org.basilevs.jstackfilter; +} \ No newline at end of file diff --git a/core/test/src/test/java/module-info.java b/core/test/src/test/java/module-info.java new file mode 100644 index 0000000..c6d9c84 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/core/test/CompletionEngine.txt b/core/test/src/test/java/org/basilevs/jstackfilter/test/CompletionEngine.txt similarity index 100% rename from core/test/CompletionEngine.txt rename to core/test/src/test/java/org/basilevs/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 index 5b0dfbb..4154585 100644 --- 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 index be85f1d..2480468 100644 --- 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 b/core/test/src/test/java/org/basilevs/jstackfilter/test/jdk_hang.txt similarity index 100% rename from core/test/jdk_hang.txt rename to core/test/src/test/java/org/basilevs/jstackfilter/test/jdk_hang.txt diff --git a/core/test/test.txt b/core/test/src/test/java/org/basilevs/jstackfilter/test/test.txt similarity index 100% rename from core/test/test.txt rename to core/test/src/test/java/org/basilevs/jstackfilter/test/test.txt diff --git a/eclipse/feature/.project b/eclipse/feature/.project index 4ca71cd..b48e439 100644 --- a/eclipse/feature/.project +++ b/eclipse/feature/.project @@ -3,6 +3,7 @@ org.basilevs.jstackfilter.eclipse.feature + org.basilevs.jstackfilter.eclipse.ui diff --git a/eclipse/feature/default.target b/eclipse/feature/default.target deleted file mode 100644 index af7d52e..0000000 --- a/eclipse/feature/default.target +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/eclipse/plugin/.project b/eclipse/plugin/.project index 0c3e205..ec48b73 100644 --- a/eclipse/plugin/.project +++ b/eclipse/plugin/.project @@ -3,6 +3,7 @@ org.basilevs.jstackfilter.eclipse.ui + org.basilevs.jstackfilter.eclipse.target-definition diff --git a/eclipse/plugin/META-INF/MANIFEST.MF b/eclipse/plugin/META-INF/MANIFEST.MF index 764bc7a..0b6c16d 100644 --- a/eclipse/plugin/META-INF/MANIFEST.MF +++ b/eclipse/plugin/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.debug.ui, org.eclipse.jdt.debug, org.eclipse.ui;bundle-version="3.0.0", org.eclipse.jdt.debug.ui;bundle-version="3.0.0", - org.basilevs.jstackfilter, org.eclipse.core.expressions;bundle-version="3.8.200", - org.eclipse.e4.core.contexts;bundle-version="1.11.0" + org.eclipse.e4.core.contexts;bundle-version="1.11.0", + org.basilevs.jstackfilter;bundle-version="0.0.6" diff --git a/eclipse/pom.xml b/eclipse/pom.xml index 2ab832f..f30e3ec 100644 --- a/eclipse/pom.xml +++ b/eclipse/pom.xml @@ -11,18 +11,64 @@ eclipse-parent pom + + 4.0.4 + + target-definition feature plugin repository + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + org.eclipse.tycho target-platform-configuration ${tycho.version} + JavaSE-17 + ignore + + + org.basilevs.jstackfilter + target-definition + ${project.version} + + + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + macosx + cocoa + x86_64 + + + macosx + cocoa + x86_64 + + + macosx + cocoa + aarch64 + + diff --git a/eclipse/repository/.project b/eclipse/repository/.project index 615f43f..7ad5de3 100644 --- a/eclipse/repository/.project +++ b/eclipse/repository/.project @@ -3,6 +3,7 @@ org.basilevs.jstackfilter.repository + org.basilevs.jstackfilter.eclipse.feature diff --git a/eclipse/target-definition/.project b/eclipse/target-definition/.project new file mode 100644 index 0000000..6a5ecef --- /dev/null +++ b/eclipse/target-definition/.project @@ -0,0 +1,11 @@ + + + org.basilevs.jstackfilter.eclipse.target-definition + + + + + + + + diff --git a/eclipse/target-definition/.settings/org.eclipse.core.resources.prefs b/eclipse/target-definition/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/eclipse/target-definition/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/eclipse/target-definition/pom.xml b/eclipse/target-definition/pom.xml new file mode 100644 index 0000000..75e08ce --- /dev/null +++ b/eclipse/target-definition/pom.xml @@ -0,0 +1,14 @@ + + 4.0.0 + + + org.basilevs.jstackfilter + eclipse-parent + ${revision} + + target-definition + eclipse-target-definition + + \ No newline at end of file diff --git a/eclipse/target-definition/target-definition.target b/eclipse/target-definition/target-definition.target new file mode 100644 index 0000000..6a4778f --- /dev/null +++ b/eclipse/target-definition/target-definition.target @@ -0,0 +1,30 @@ + + + + + + + + + + + + + org.basilevs.jstackfilter + org.basilevs.jstackfilter + 0.0.6-SNAPSHOT + jar + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a185832..28f7578 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,6 @@ org.basilevs.jstackfilter parent - 4.0.4 0.0.6-SNAPSHOT 17 17 @@ -22,52 +21,6 @@ - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - - ../../eclipse/feature/default.target - - JavaSE-17 - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - macosx - cocoa - x86_64 - - - macosx - cocoa - x86_64 - - - macosx - cocoa - aarch64 - - - - -