rpms/modello
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 2.1.2

Browse Source
This commit is contained in:
Mikolaj Izdebski 2023-08-27 07:46:14 +02:00
parent 1cd453685b
commit e6fb422b01
4 changed files with 200 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -18,3 +18,4 @@
/modello-1.11-source-release.zip
/modello-2.0.0-source-release.zip
/modello-2.1.1-source-release.zip
/modello-2.1.2-source-release.zip

184
0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch Normal file
View File

@ -0,0 +1,184 @@
From f892c4e5906fcacaec99a146a2a36dd4ca5d5166 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 27 Aug 2023 07:49:01 +0200
Subject: [PATCH] Revert "Switch to codehaus plexus-build-api 1.2.0 (#345)"
This reverts commit c689155598257f225963b9332f57fe72dfd78753.
---
modello-core/pom.xml | 2 +-
.../codehaus/modello/plugin/AbstractModelloGenerator.java | 2 +-
modello-maven-plugin/pom.xml | 2 +-
.../modello/maven/AbstractModelloGeneratorMojo.java | 2 +-
.../codehaus/modello/maven/ModelloConvertersMojoTest.java | 8 +-------
.../org/codehaus/modello/maven/ModelloJavaMojoTest.java | 8 +-------
modello-plugins/modello-plugin-java/pom.xml | 2 +-
.../codehaus/modello/AbstractModelloGeneratorTest.java | 6 ------
pom.xml | 4 ++--
9 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/modello-core/pom.xml b/modello-core/pom.xml
index 636c03fe..7f9adf39 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>
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 bb59b439..334e16e8 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,7 +43,6 @@ import org.codehaus.modello.model.ModelField;
import org.codehaus.modello.model.Version;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
@@ -51,6 +50,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.io.CachingWriter;
+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 3687fb05..57227449 100644
--- a/modello-maven-plugin/pom.xml
+++ b/modello-maven-plugin/pom.xml
@@ -121,7 +121,7 @@
<artifactId>modello-plugin-velocity</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
</dependencies>
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 779f178d..23f466d3 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
@@ -26,10 +26,9 @@ import java.io.File;
import java.util.Arrays;
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>
@@ -99,9 +98,4 @@ public class ModelloConvertersMojoTest extends PlexusTestCase {
assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists());
}
-
- @Override
- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
- containerConfiguration.setClassPathScanning("cache");
- }
}
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 f15b4031..bb5bb7cf 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
@@ -26,10 +26,9 @@ import java.io.File;
import java.util.Arrays;
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>
@@ -97,9 +96,4 @@ public class ModelloJavaMojoTest extends PlexusTestCase {
assertFalse(
"The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists());
}
-
- @Override
- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
- containerConfiguration.setClassPathScanning("cache");
- }
}
diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml
index ea94c3c6..6ba7c01f 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/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
index f46cece1..e71231fb 100644
--- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
+++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
@@ -32,7 +32,6 @@ import java.io.Reader;
import java.util.Optional;
import java.util.Properties;
-import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.ReaderFactory;
@@ -108,9 +107,4 @@ public abstract class AbstractModelloGeneratorTest extends PlexusTestCase {
new File(getOutputDirectory(), generatedXsdName));
return saxParser;
}
-
- @Override
- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
- containerConfiguration.setClassPathScanning("cache");
- }
}
diff --git a/pom.xml b/pom.xml
index 88f8ed6f..9a4ac6df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,9 +347,9 @@
<version>4.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>junit</groupId>
--
2.41.0

26
modello.spec
View File

@ -1,7 +1,7 @@
%bcond_with bootstrap
Name: modello
Version: 2.1.1
Version: 2.1.2
Release: 1%{?dist}
Summary: Modello Data Model toolkit
# The majority of files are under MIT license, but some of them are ASL 2.0.
@ -9,19 +9,19 @@ Summary: Modello Data Model toolkit
# and are licensed under a 5-clause BSD license.
License: MIT and ASL 2.0 and BSD
URL: https://codehaus-plexus.github.io/modello
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Patch0: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(com.google.inject:guice)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
@ -29,11 +29,11 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac)
BuildRequires: mvn(org.apache.velocity:velocity-engine-core)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildRequires: mvn(org.jsoup:jsoup)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
@ -60,11 +60,13 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
cp -p %{SOURCE1} LICENSE
# We don't generate site; don't pull extra dependencies.
%pom_remove_plugin :maven-site-plugin
%pom_remove_dep -r :sisu-guice
%pom_remove_dep :plexus-xml modello-core
%pom_remove_dep :sisu-guice modello-core
%pom_add_dep com.google.inject:guice modello-core
%pom_remove_dep :jackson-bom
@ -76,10 +78,7 @@ cp -p %{SOURCE1} LICENSE
%pom_disable_module modello-plugin-snakeyaml modello-plugins
%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
# Requires velocity >= 2
%pom_disable_module modello-plugin-velocity modello-plugins
%pom_remove_dep :modello-plugin-velocity modello-maven-plugin
rm modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
%pom_disable_module modello-test
%build
# skip tests because we have too old xmlunit in Fedora now (1.0.8)
@ -88,7 +87,7 @@ rm modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocity
%install
%mvn_install
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api0:guava:velocity/velocity-engine-core %{name} true
%files -f .mfiles
%doc LICENSE
@ -98,6 +97,9 @@ rm modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocity
%doc LICENSE
%changelog
* Mon Aug 28 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.2-1
- Update to upstream version 2.1.2
* Mon Aug 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-1
- Update to upstream version 2.1.1

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (modello-2.1.1-source-release.zip) = 928ecf83d7555bba534fc0ad0a71ac245d1508ee09de5db5ae84eb5e982b9a7fad8d5e7370641a1d93316f558ee151535f0c48e53a56ed31df54d6d628a7bb77
SHA512 (modello-2.1.2-source-release.zip) = 2824bcd3fbf8244fbec527e06f1be9aa17a176e4fd4159c228b576f62f94592c19fd39581fa4cd211c4ddc07b86d3595c992cf0a7405e341513bdd74261f4ecd
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8