From d03c911b1e2aa4b7f5a70edd2ba24ed347691169d8fb6bb575e0cea2a90eb48e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 1 May 2024 12:23:37 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=46 --- ...-codehaus-plexus-build-api-1.2.0-345.patch | 142 ------------------ modello-maven-plugin.changes | 8 + modello-maven-plugin.spec | 4 +- modello.changes | 8 + modello.spec | 4 +- 5 files changed, 18 insertions(+), 148 deletions(-) delete mode 100644 0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch diff --git a/0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch b/0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch deleted file mode 100644 index 2f8aa58..0000000 --- a/0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 5dd8c6daa70e8f22fa12b026e4474d8bf4e2c4d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Tue, 9 Apr 2024 14:37:06 +0200 -Subject: [PATCH 3/3] Revert "Switch to codehaus plexus-build-api 1.2.0 (#345)" - -This reverts commit c689155598257f225963b9332f57fe72dfd78753. ---- - modello-core/pom.xml | 3 +-- - .../org/codehaus/modello/plugin/AbstractModelloGenerator.java | 2 +- - modello-maven-plugin/pom.xml | 2 +- - .../codehaus/modello/maven/AbstractModelloGeneratorMojo.java | 2 +- - .../org/codehaus/modello/maven/ModelloConvertersMojoTest.java | 2 +- - .../java/org/codehaus/modello/maven/ModelloJavaMojoTest.java | 2 +- - modello-plugins/modello-plugin-java/pom.xml | 2 +- - pom.xml | 4 ++-- - 8 files changed, 9 insertions(+), 10 deletions(-) - -diff --git a/modello-core/pom.xml b/modello-core/pom.xml -index 1b0f2258..51970394 100644 ---- a/modello-core/pom.xml -+++ b/modello-core/pom.xml -@@ -13,7 +13,7 @@ - - - -- org.codehaus.plexus -+ org.sonatype.plexus - plexus-build-api - - -@@ -25,7 +25,6 @@ - org.sonatype.sisu - sisu-guice - no_aop -- runtime - - - org.codehaus.plexus -diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java -index a297210d..ffa6ae27 100644 ---- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java -+++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java -@@ -43,11 +43,11 @@ import org.codehaus.modello.model.ModelClass; - import org.codehaus.modello.model.ModelDefault; - import org.codehaus.modello.model.ModelField; - import org.codehaus.modello.model.Version; --import org.codehaus.plexus.build.BuildContext; - import org.codehaus.plexus.util.StringUtils; - import org.codehaus.plexus.util.io.CachingWriter; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; -+import org.sonatype.plexus.build.incremental.BuildContext; - - /** - * @author Jason van Zyl -diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml -index 0a842b8f..8d0fb29a 100644 ---- a/modello-maven-plugin/pom.xml -+++ b/modello-maven-plugin/pom.xml -@@ -116,7 +116,7 @@ - modello-plugin-velocity - - -- org.codehaus.plexus -+ org.sonatype.plexus - plexus-build-api - - -diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java -index 762b5784..51b75a12 100644 ---- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java -+++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java -@@ -41,8 +41,8 @@ import org.codehaus.modello.ModelloParameterConstants; - import org.codehaus.modello.core.ModelloCore; - import org.codehaus.modello.model.Model; - import org.codehaus.modello.model.ModelValidationException; --import org.codehaus.plexus.build.BuildContext; - import org.codehaus.plexus.util.StringUtils; -+import org.sonatype.plexus.build.incremental.BuildContext; - - /** - * @author Trygve Laugstøl -diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java -index 92adde1f..2e747a98 100644 ---- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java -+++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java -@@ -29,8 +29,8 @@ import org.apache.maven.project.MavenProject; - import org.codehaus.modello.core.ModelloCore; - import org.codehaus.plexus.ContainerConfiguration; - import org.codehaus.plexus.PlexusTestCase; --import org.codehaus.plexus.build.BuildContext; - import org.codehaus.plexus.util.FileUtils; -+import org.sonatype.plexus.build.incremental.BuildContext; - - /** - * @author Brett Porter -diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java -index ef234cac..64589165 100644 ---- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java -+++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java -@@ -29,8 +29,8 @@ import org.apache.maven.project.MavenProject; - import org.codehaus.modello.core.ModelloCore; - import org.codehaus.plexus.ContainerConfiguration; - import org.codehaus.plexus.PlexusTestCase; --import org.codehaus.plexus.build.BuildContext; - import org.codehaus.plexus.util.FileUtils; -+import org.sonatype.plexus.build.incremental.BuildContext; - - /** - * @author Trygve Laugstøl -diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml -index 46f5f68b..d40b53cd 100644 ---- a/modello-plugins/modello-plugin-java/pom.xml -+++ b/modello-plugins/modello-plugin-java/pom.xml -@@ -17,7 +17,7 @@ - plexus-utils - - -- org.codehaus.plexus -+ org.sonatype.plexus - plexus-build-api - - -diff --git a/pom.xml b/pom.xml -index 4ae44cec..59af89cd 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -316,9 +316,9 @@ - 3.0.0 - - -- org.codehaus.plexus -+ org.sonatype.plexus - plexus-build-api -- 1.2.0 -+ 0.0.7 - - - org.slf4j --- -2.44.0 - diff --git a/modello-maven-plugin.changes b/modello-maven-plugin.changes index f0ebba9..19d6eaf 100644 --- a/modello-maven-plugin.changes +++ b/modello-maven-plugin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 1 12:22:05 UTC 2024 - Fridrich Strba + +- Build against the new codehaus plexus build api 1.2.0 +- Removed patch: + * 0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch + + not needed any more + ------------------------------------------------------------------- Tue Apr 16 13:04:04 UTC 2024 - Fridrich Strba diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec index 78d8078..5616b68 100644 --- a/modello-maven-plugin.spec +++ b/modello-maven-plugin.spec @@ -29,7 +29,6 @@ Source0: https://repo1.maven.org/maven2/org/codehaus/%{parent}/%{parent}/ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Patch0: 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch Patch1: 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch -Patch2: 0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip @@ -52,9 +51,9 @@ BuildRequires: mvn(org.codehaus.modello:modello-plugin-velocity) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-xdoc) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-xpp3) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-xsd) = %{version} +BuildRequires: mvn(org.codehaus.plexus:plexus-build-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) -BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) #!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-jar-plugin-bootstrap #!BuildRequires: maven-javadoc-plugin-bootstrap @@ -85,7 +84,6 @@ API documentation for %{name}. %setup -q -n %{parent}-%{version} %patch -P 0 -p1 %patch -P 1 -p1 -%patch -P 2 -p1 cp -p %{SOURCE1} LICENSE %pom_remove_plugin :maven-site-plugin diff --git a/modello.changes b/modello.changes index 5a27975..e048270 100644 --- a/modello.changes +++ b/modello.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 1 12:22:05 UTC 2024 - Fridrich Strba + +- Build against the new codehaus plexus build api 1.2.0 +- Removed patch: + * 0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch + + not needed any more + ------------------------------------------------------------------- Tue Apr 16 13:04:04 UTC 2024 - Fridrich Strba diff --git a/modello.spec b/modello.spec index 930f323..f27c10c 100644 --- a/modello.spec +++ b/modello.spec @@ -28,7 +28,6 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source100: %{name}-build.tar.xz Patch0: 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch Patch1: 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch -Patch2: 0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch BuildRequires: ant BuildRequires: aopalliance BuildRequires: atinject @@ -41,7 +40,7 @@ BuildRequires: javapackages-local >= 6 BuildRequires: jsoup BuildRequires: junit BuildRequires: objectweb-asm -BuildRequires: plexus-build-api +BuildRequires: plexus-build-api >= 1.0 BuildRequires: plexus-classworlds BuildRequires: plexus-compiler BuildRequires: plexus-utils @@ -100,7 +99,6 @@ API documentation for %{name}. %setup -q -a100 %patch -P 0 -p1 %patch -P 1 -p1 -%patch -P 2 -p1 cp -p %{SOURCE1} LICENSE %pom_remove_plugin :maven-site-plugin From bb2ee370211fb92e3dfd0146a1b7ef86c436ba5cff4940292faf265ff9eac1ff Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 1 May 2024 12:27:44 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=47 --- modello.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index f27c10c..112a1d7 100644 --- a/modello.spec +++ b/modello.spec @@ -59,6 +59,7 @@ Requires: jackson-core Requires: javadoc-parser Requires: javapackages-tools Requires: plexus-build-api +Requires: plexus-build-api0 Requires: plexus-classworlds Requires: plexus-utils Requires: plexus-xml @@ -166,7 +167,7 @@ done %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:jackson-core:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:jackson-core:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:plexus/plexus-build-api0:guava:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true %files -f .mfiles -f .mfiles-core %license LICENSE From 737d74ae5034d81e6268f491eca993350aa612ad6e1f77aeca9d4cc1ac4e9475 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 2 May 2024 11:52:20 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=48 --- modello.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modello.spec b/modello.spec index 112a1d7..5a5066b 100644 --- a/modello.spec +++ b/modello.spec @@ -29,19 +29,15 @@ Source100: %{name}-build.tar.xz Patch0: 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch Patch1: 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch BuildRequires: ant -BuildRequires: aopalliance BuildRequires: atinject BuildRequires: fdupes -BuildRequires: google-guice BuildRequires: guava BuildRequires: jackson-core BuildRequires: javadoc-parser BuildRequires: javapackages-local >= 6 BuildRequires: jsoup BuildRequires: junit -BuildRequires: objectweb-asm BuildRequires: plexus-build-api >= 1.0 -BuildRequires: plexus-classworlds BuildRequires: plexus-compiler BuildRequires: plexus-utils BuildRequires: plexus-xml @@ -61,6 +57,7 @@ Requires: javapackages-tools Requires: plexus-build-api Requires: plexus-build-api0 Requires: plexus-classworlds +Requires: plexus-containers-component-annotations Requires: plexus-utils Requires: plexus-xml Requires: sisu-inject @@ -116,17 +113,14 @@ cp -p %{SOURCE1} LICENSE %build mkdir -p lib build-jar-repository -s lib \ - aopalliance \ atinject \ guava/guava \ - guice/google-guice \ jackson-core \ javadoc-parser \ jsoup \ junit \ org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ - plexus/classworlds \ plexus/cli \ plexus-compiler \ plexus/plexus-build-api \ @@ -167,7 +161,7 @@ done %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:jackson-core:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:plexus/plexus-build-api0:guava:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true %files -f .mfiles -f .mfiles-core %license LICENSE