From 694de713903e741d3a3fb17bee11f30fc227a1a8f28f914993e40c9d7e4d22c6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 16:42:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=64 --- tycho-mpp-311.patch | 403 ++++++++++++++++++++++++++++++++++++++++++++ tycho.changes | 7 + tycho.spec | 2 + 3 files changed, 412 insertions(+) create mode 100644 tycho-mpp-311.patch diff --git a/tycho-mpp-311.patch b/tycho-mpp-311.patch new file mode 100644 index 0000000..6675c6d --- /dev/null +++ b/tycho-mpp-311.patch @@ -0,0 +1,403 @@ +--- tycho-1.6.0/target-platform-configuration/pom.xml 2024-05-15 14:36:53.368098051 +0200 ++++ tycho-1.6.0/target-platform-configuration/pom.xml 2024-05-15 15:10:03.548000115 +0200 +@@ -50,4 +50,18 @@ + ${project.version} + + ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ target-platform-configuration ++ ++ ++ ++ ++ + +--- tycho-1.6.0/tycho-compiler-plugin/pom.xml 2024-05-15 14:36:53.371431408 +0200 ++++ tycho-1.6.0/tycho-compiler-plugin/pom.xml 2024-05-15 14:52:36.587501116 +0200 +@@ -81,4 +81,16 @@ + + + ++ ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-compiler ++ ++ ++ ++ + +--- tycho-1.6.0/tycho-extras/pack200/tycho-pack200a-plugin/pom.xml 2024-05-15 14:36:53.404764973 +0200 ++++ tycho-1.6.0/tycho-extras/pack200/tycho-pack200a-plugin/pom.xml 2024-05-15 18:14:59.261868858 +0200 +@@ -34,4 +34,18 @@ + ${project.version} + + ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-pack200a ++ ++ ++ ++ ++ + +\ No newline at end of file +--- tycho-1.6.0/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml 2024-05-15 18:28:21.073980942 +0200 ++++ tycho-1.6.0/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml 2024-05-15 18:26:31.363232566 +0200 +@@ -39,4 +39,18 @@ + ${project.version} + + ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-pack200b ++ ++ ++ ++ ++ + +--- tycho-1.6.0/tycho-extras/target-platform-validation-plugin/pom.xml 2024-05-15 14:36:53.408098330 +0200 ++++ tycho-1.6.0/tycho-extras/target-platform-validation-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 +@@ -34,6 +34,19 @@ + + + ++ ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ target-platform-validation ++ ++ ++ ++ ++ + + + its +--- tycho-1.6.0/tycho-extras/tycho-custom-bundle-plugin/pom.xml 2024-05-15 14:36:53.408098330 +0200 ++++ tycho-1.6.0/tycho-extras/tycho-custom-bundle-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 +@@ -61,6 +61,14 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-custom-bundle ++ ++ + + + +--- tycho-1.6.0/tycho-extras/tycho-dependency-tools-plugin/pom.xml 2024-05-15 14:36:53.411431686 +0200 ++++ tycho-1.6.0/tycho-extras/tycho-dependency-tools-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 +@@ -63,6 +63,14 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-dependency-tools ++ ++ + + + +--- tycho-1.6.0/tycho-extras/tycho-document-bundle-plugin/pom.xml 2024-05-15 14:36:53.411431686 +0200 ++++ tycho-1.6.0/tycho-extras/tycho-document-bundle-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 +@@ -70,6 +70,14 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-document-bundle ++ ++ + + + +--- tycho-1.6.0/tycho-extras/tycho-eclipserun-plugin/pom.xml 2024-05-15 14:36:53.414765043 +0200 ++++ tycho-1.6.0/tycho-extras/tycho-eclipserun-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 +@@ -65,4 +65,17 @@ + + + ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-eclipserun ++ ++ ++ ++ + +--- tycho-1.6.0/tycho-extras/tycho-p2-extras-plugin/pom.xml 2024-05-15 14:36:53.418098399 +0200 ++++ tycho-1.6.0/tycho-extras/tycho-p2-extras-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 +@@ -147,6 +147,14 @@ + + + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-p2-extras ++ ++ + + + +--- tycho-1.6.0/tycho-extras/tycho-source-feature-plugin/pom.xml 2024-05-15 14:36:53.428098469 +0200 ++++ tycho-1.6.0/tycho-extras/tycho-source-feature-plugin/pom.xml 2024-05-15 18:03:12.193732390 +0200 +@@ -64,6 +64,14 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-source-feature ++ ++ + + + +--- tycho-1.6.0/tycho-extras/tycho-version-bump-plugin/pom.xml 2024-05-15 14:36:53.431431826 +0200 ++++ tycho-1.6.0/tycho-extras/tycho-version-bump-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 +@@ -40,6 +40,19 @@ + + + ++ ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-version-bump ++ ++ ++ ++ ++ + + + its +--- tycho-1.6.0/tycho-p2/tycho-p2-director-plugin/pom.xml 2024-05-15 14:36:53.518099095 +0200 ++++ tycho-1.6.0/tycho-p2/tycho-p2-director-plugin/pom.xml 2024-05-15 15:37:12.049317436 +0200 +@@ -92,6 +92,18 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.codehaus.plexus ++ plexus-component-metadata ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-p2-director ++ ++ + + + +--- tycho-1.6.0/tycho-p2/tycho-p2-plugin/pom.xml 2024-05-15 14:36:53.521432452 +0200 ++++ tycho-1.6.0/tycho-p2/tycho-p2-plugin/pom.xml 2024-05-15 15:28:50.812488466 +0200 +@@ -67,6 +67,14 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-p2 ++ ++ + + + +--- tycho-1.6.0/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2024-05-15 14:36:53.521432452 +0200 ++++ tycho-1.6.0/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2024-05-15 15:31:22.453546150 +0200 +@@ -65,4 +65,20 @@ + + + ++ ++ ++ ++ org.codehaus.plexus ++ plexus-component-metadata ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-p2-publisher ++ ++ ++ ++ + +--- tycho-1.6.0/tycho-p2/tycho-p2-repository-plugin/pom.xml 2024-05-15 14:36:53.524765809 +0200 ++++ tycho-1.6.0/tycho-p2/tycho-p2-repository-plugin/pom.xml 2024-05-15 15:31:44.727034811 +0200 +@@ -42,4 +42,20 @@ + + + ++ ++ ++ ++ org.codehaus.plexus ++ plexus-component-metadata ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-p2-repository ++ ++ ++ ++ + +--- tycho-1.6.0/tycho-packaging-plugin/pom.xml 2024-05-15 14:36:53.524765809 +0200 ++++ tycho-1.6.0/tycho-packaging-plugin/pom.xml 2024-05-15 14:38:16.382009244 +0200 +@@ -86,6 +86,14 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-packaging ++ ++ + + + +--- tycho-1.6.0/tycho-pomgenerator-plugin/pom.xml 2024-05-15 14:36:53.531432522 +0200 ++++ tycho-1.6.0/tycho-pomgenerator-plugin/pom.xml 2024-05-15 15:45:25.876094536 +0200 +@@ -62,4 +62,16 @@ + + + ++ ++ ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-pomgenerator ++ ++ ++ ++ + +--- tycho-1.6.0/tycho-release/tycho-versions-plugin/pom.xml 2024-05-15 14:36:53.534765878 +0200 ++++ tycho-1.6.0/tycho-release/tycho-versions-plugin/pom.xml 2024-05-15 15:51:56.869138499 +0200 +@@ -66,6 +66,14 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-versions ++ ++ + + + +--- tycho-1.6.0/tycho-source-plugin/pom.xml 2024-05-15 14:36:53.548099304 +0200 ++++ tycho-1.6.0/tycho-source-plugin/pom.xml 2024-05-15 14:38:17.828685979 +0200 +@@ -93,6 +93,14 @@ + org.codehaus.plexus + plexus-component-metadata + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-source ++ ++ + + + +--- tycho-1.6.0/tycho-surefire/tycho-surefire-plugin/pom.xml 2024-05-15 14:36:53.551432661 +0200 ++++ tycho-1.6.0/tycho-surefire/tycho-surefire-plugin/pom.xml 2024-05-15 14:38:17.828685979 +0200 +@@ -39,6 +39,14 @@ + + + ++ ++ org.apache.maven.plugins ++ maven-plugin-plugin ++ ++ ++ tycho-surefire ++ ++ + + + diff --git a/tycho.changes b/tycho.changes index 65ae5c1..1b9be09 100644 --- a/tycho.changes +++ b/tycho.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 15 16:39:13 UTC 2024 - Fridrich Strba + +- Added patch: + * tycho-mpp-311.patch + + fix build with maven-plugin-plugin >= 3.11 + ------------------------------------------------------------------- Wed Apr 17 12:49:52 UTC 2024 - Fridrich Strba diff --git a/tycho.spec b/tycho.spec index 63e86c4..bce043a 100644 --- a/tycho.spec +++ b/tycho.spec @@ -70,6 +70,7 @@ Patch10: tycho-sourcetarget.patch Patch11: tycho-getTimestamp.patch Patch12: tycho-surefire.patch Patch13: tycho-surefire3.patch +Patch14: tycho-mpp-311.patch Patch100: fedoraproject-p2-bootstrap-fix.patch BuildRequires: bash BuildRequires: fdupes @@ -223,6 +224,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2 %patch -P 11 -p1 %patch -P 12 -p1 %patch -P 13 -p1 +%patch -P 14 -p1 %patch -P 100 # Unneeded for RPM builds