Accepting request 1109297 from Java:packages

2.1.2

OBS-URL: https://build.opensuse.org/request/show/1109297
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/modello?expand=0&rev=9

0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch

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

modello-cli-domasxpp3.patch

@@ -1,11 +1,10 @@
---- modello-2.0.0/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java	2022-02-13 14:30:34.000000000 +0100
+--- modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java	2023-09-04 23:38:10.194571922 +0200
-+++ modello-2.0.0/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java	2022-05-10 09:08:57.893555360 +0200
++++ modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java	2023-09-05 12:10:26.198361088 +0200
-@@ -114,6 +114,15 @@
+@@ -105,11 +105,24 @@
- 
+             System.exit(1);
-             System.exit( 1 );
          }
-+        if ( StringUtils.equalsIgnoreCase( javaSource, "true" ) || StringUtils.equalsIgnoreCase( javaSource, "false" ) )
+ 
-+        {
++        if ( StringUtils.equalsIgnoreCase( javaSource, "true" ) || StringUtils.equalsIgnoreCase( javaSource, "false" ) ) {
 +            // The old useJava5 parameter at this position
 +            System.err.println( "Missing required parameter: Java Source (replacing the old \"Use Java5\" parameter)" );
 +
@@ -13,26 +12,24 @@
 +
 +            System.exit( 1 );
 +        }
++
+         parameters.setProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource);
  
-         parameters.setProperty( ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource );
+         if (args.length > 6) {
- 
+             parameters.setProperty(ModelloParameterConstants.ENCODING, args[6]);
-@@ -121,6 +130,11 @@
-         {
-             parameters.setProperty( ModelloParameterConstants.ENCODING, args[6] );
          }
 +
-+        if ( args.length > 7 )
++        if ( args.length > 7 ) {
-+        {
 +            parameters.setProperty( ModelloParameterConstants.DOM_AS_XPP3, args[7] );
 +        }
      }
  
      // ----------------------------------------------------------------------
-@@ -130,6 +144,6 @@
+@@ -118,6 +131,6 @@
-     private static void usage()
+ 
-     {
+     private static void usage() {
-         System.err.println( "Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>"
+         System.err.println("Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>"
--                            + "<javaSource> [<encoding>]" );
+-                + "<javaSource> [<encoding>]");
-+                            + " <javaSource> [<encoding> [<domAsXpp3>]]" );
++                + " <javaSource> [<encoding> [<domAsXpp3>]]" );
      }
  }

modello-maven-plugin.changes

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Wed Sep  6 14:43:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 2.1.2
+  * Changes of version 2.1.2
+    + Switch to codehaus plexus-build-api 1.2.0 (reverted by a
+      patch in this package)
+    + Add plexus 13 parent and reformat
+    + Remove readonly flag from basedir: support .mdo from any
+      location
+    + Require Maven 3.5.4+
+    + Prepare to run with Java 19+
+  * Changes of version 2.1.1
+    + replace generatedBy context value by template
+    + add velocityBasedir to select where to load (shared) .vm from
+  * Changes of version 2.1.0
+    + Make the Xpp3Reader#read(XmlPullParser, boolean strict) public
+    + Fix json encoding
+    + Support arbitrary element names via 'xs:any'
+    + Call setter only after object has been populated
+    + replace handwritten components.xml with annotations
+    + Optionally enforce required elements in XSDs
+    + Add a velocity template based generator
+    + Use optimised plexus-utils CachingWriter
+- Added patch:
+  * 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
+    + use the version of plexus-build-api that we have packaged
+- Modified patch:
+  * modello-cli-domasxpp3.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Fri May 13 08:54:49 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

modello-maven-plugin.spec

@@ -19,14 +19,16 @@
 %global parent modello
 %global subname maven-plugin
 Name:           %{parent}-%{subname}
-Version:        2.0.0
+Version:        2.1.2
 Release:        0
 Summary:        Modello Maven Plugin
 License:        Apache-2.0 AND MIT
 Group:          Development/Libraries/Java
 URL:            https://codehaus-plexus.github.io/modello/modello-maven-plugin
 Source0:        https://repo1.maven.org/maven2/org/codehaus/%{parent}/%{parent}/%{version}/%{parent}-%{version}-source-release.zip
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
+Patch0:         modello-cli-domasxpp3.patch
+Patch1:         0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  unzip
@@ -45,7 +47,9 @@ BuildRequires:  mvn(org.codehaus.modello:modello-plugin-stax) = %{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-component-metadata)
 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
@@ -75,18 +79,31 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{parent}-%{version}
+%patch0 -p1
+%patch1 -p1
 cp -p %{SOURCE1} LICENSE
 
 %pom_remove_plugin :maven-site-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+
+%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
 
 %pom_disable_module modello-plugin-jackson modello-plugins
 %pom_disable_module modello-plugin-jsonschema modello-plugins
 %pom_disable_module modello-plugin-snakeyaml modello-plugins
+%pom_disable_module modello-plugin-velocity modello-plugins
 %pom_remove_dep :modello-plugin-jackson modello-maven-plugin
 %pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin
 %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
+%pom_remove_dep :modello-plugin-velocity modello-maven-plugin
+
+rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
+
+%pom_disable_module modello-test
 
 %build
 pushd %{name}

modello.changes

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Wed Sep  6 14:43:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 2.1.2
+  * Changes of version 2.1.2
+    + Switch to codehaus plexus-build-api 1.2.0 (reverted by a
+      patch in this package)
+    + Add plexus 13 parent and reformat
+    + Remove readonly flag from basedir: support .mdo from any
+      location
+    + Require Maven 3.5.4+
+    + Prepare to run with Java 19+
+  * Changes of version 2.1.1
+    + replace generatedBy context value by template
+    + add velocityBasedir to select where to load (shared) .vm from
+  * Changes of version 2.1.0
+    + Make the Xpp3Reader#read(XmlPullParser, boolean strict) public
+    + Fix json encoding
+    + Support arbitrary element names via 'xs:any'
+    + Call setter only after object has been populated
+    + replace handwritten components.xml with annotations
+    + Optionally enforce required elements in XSDs
+    + Add a velocity template based generator
+    + Use optimised plexus-utils CachingWriter
+- Added patch:
+  * 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
+    + use the version of plexus-build-api that we have packaged
+- Modified patch:
+  * modello-cli-domasxpp3.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Thu May  4 14:27:26 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 

modello.spec

@@ -17,39 +17,35 @@
 
 
 Name:           modello
-Version:        2.0.0
+Version:        2.1.2
 Release:        0
 Summary:        Modello Data Model toolkit
 License:        Apache-2.0 AND MIT
 Group:          Development/Libraries/Java
 URL:            https://codehaus-plexus.github.io/modello
 Source0:        https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 Source100:      %{name}-build.tar.xz
 Patch0:         modello-cli-domasxpp3.patch
+Patch1:         0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  google-guice
 BuildRequires:  guava
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  jsoup
 BuildRequires:  junit
 BuildRequires:  plexus-build-api
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-compiler
+BuildRequires:  plexus-containers-component-annotations
+BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 Requires:       guava
 Requires:       javapackages-tools
 Requires:       xbean
-Requires:       mvn(org.codehaus.plexus:plexus-compiler-api)
-Requires:       mvn(org.codehaus.plexus:plexus-compiler-javac)
-Requires:       mvn(org.codehaus.plexus:plexus-utils)
-Requires:       mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
-Requires:       mvn(org.jsoup:jsoup)
-Requires:       mvn(org.sonatype.plexus:plexus-build-api)
-Requires:       mvn(org.sonatype.sisu:sisu-guice::no_aop:)
 BuildArch:      noarch
 
 %description
@@ -71,25 +67,55 @@ API documentation for %{name}.
 %prep
 %setup -q -a100
 %patch0 -p1
+%patch1 -p1
 cp -p %{SOURCE1} LICENSE
 
 %pom_remove_plugin :maven-site-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+
+%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
 
 %pom_disable_module modello-plugin-jackson modello-plugins
 %pom_disable_module modello-plugin-jsonschema modello-plugins
 %pom_disable_module modello-plugin-snakeyaml modello-plugins
+%pom_disable_module modello-plugin-velocity modello-plugins
 %pom_remove_dep :modello-plugin-jackson modello-maven-plugin
 %pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin
 %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
+%pom_remove_dep :modello-plugin-velocity modello-maven-plugin
+
+rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
+
+%pom_disable_module modello-test
 
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/classworlds plexus/utils plexus/plexus-build-api \
+build-jar-repository -s lib \
-  plexus-compiler/plexus-compiler-api plexus-compiler/plexus-compiler-javac \
+	atinject \
-  jsoup guava/guava junit org.eclipse.sisu.plexus
+	commons-cli \
-# skip tests because we have too old xmlunit in openSUSE now (1.5)
+    guava/guava \
+    guice/google-guice \
+	jdom2/jdom2 \
+    jsoup \
+    junit \
+	objectweb-asm/asm \
+    org.eclipse.sisu.inject \
+    org.eclipse.sisu.plexus \
+    plexus/classworlds \
+	plexus/cli \
+    plexus/plexus-build-api \
+    plexus/utils \
+    plexus-compiler/plexus-compiler-api \
+    plexus-compiler/plexus-compiler-javac \
+    plexus-containers/plexus-component-annotations \
+    plexus-metadata-generator \
+	qdox \
+	xbean/xbean-reflect
+
 %{ant} \
   -Dtest.skip=true \
   package javadoc
@@ -98,7 +124,7 @@ build-jar-repository -s lib plexus/classworlds plexus/utils plexus/plexus-build-
 # jars
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
 
-for i in core test; do
+for i in core; do
   install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
 done
 
@@ -109,26 +135,20 @@ done
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+for i in core; do
-%add_maven_depmap %{name}/%{name}.pom
+  %mvn_install_pom %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom
-
-install -pm 0644 %{name}-plugins/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugins.pom
-%add_maven_depmap %{name}/%{name}-plugins.pom
-
-for i in core test; do
-  install -pm 0644 %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom
   %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar
 done
 
 for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do
-  install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom
+  %mvn_install_pom %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom
   %add_maven_depmap %{name}/%{name}-plugin-${i}.pom %{name}/%{name}-plugin-${i}.jar
 done
 
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 
-for i in core test; do
+for i in core; do
   install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
   cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
 done
@@ -141,7 +161,7 @@ done
 %fdupes -s %{buildroot}%{_javadocdir}
 
 # script
-%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice-no_aop: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-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true
 
 %files -f .mfiles
 %license LICENSE