pool/modello
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 1171345 from Java:packages

Browse Source 
plexus-build-api 1.2.0 + dependent changes

OBS-URL: https://build.opensuse.org/request/show/1171345
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/modello?expand=0&rev=15
This commit is contained in:
Ana Guerrero 2024-05-02 21:47:10 +00:00 committed by Git OBS Bridge
commit 23aea00378
5 changed files with 21 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
0003-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
View File

@ -1,142 +0,0 @@
From 5dd8c6daa70e8f22fa12b026e4474d8bf4e2c4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
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 @@
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
<dependency>
@@ -25,7 +25,6 @@
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<classifier>no_aop</classifier>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
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 <a href="mailto:jason@modello.org">Jason van Zyl</a>
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 @@
<artifactId>modello-plugin-velocity</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
<dependency>
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 <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
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 <a href="mailto:brett@apache.org">Brett Porter</a>
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 <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
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 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index 4ae44cec..59af89cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,9 +316,9 @@
<version>3.0.0</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
- <version>1.2.0</version>
+ <version>0.0.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
--
2.44.0

8
modello-maven-plugin.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 1 12:22:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>

4
modello-maven-plugin.spec
View File

@ -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

8
modello.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 1 12:22:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>

15
modello.spec
View File

@ -28,21 +28,16 @@ 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
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
BuildRequires: plexus-classworlds
BuildRequires: plexus-build-api >= 1.0
BuildRequires: plexus-compiler
BuildRequires: plexus-utils
BuildRequires: plexus-xml
@ -60,7 +55,9 @@ Requires: jackson-core
Requires: javadoc-parser
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
@ -100,7 +97,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
@ -117,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 \
@ -168,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: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