Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package modello for openSUSE:Factory checked
in at 2024-04-17 16:21:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/modello (Old)
and /work/SRC/openSUSE:Factory/.modello.new.26366 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "modello"
Wed Apr 17 16:21:22 2024 rev:14 rq:1168541 version:2.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes
2024-04-15 20:23:21.747453918 +0200
+++ /work/SRC/openSUSE:Factory/.modello.new.26366/modello-maven-plugin.changes
2024-04-17 16:24:49.333604078 +0200
@@ -1,0 +2,5 @@
+Tue Apr 16 13:04:04 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Build all modello plugins
+
+-------------------------------------------------------------------
modello.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ modello-maven-plugin.spec ++++++
--- /var/tmp/diff_new_pack.gWiDm0/_old 2024-04-17 16:24:49.993628223 +0200
+++ /var/tmp/diff_new_pack.gWiDm0/_new 2024-04-17 16:24:49.993628223 +0200
@@ -41,10 +41,14 @@
BuildRequires: mvn(org.codehaus.modello:modello-core) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-converters) =
%{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-dom4j) = %{version}
+BuildRequires: mvn(org.codehaus.modello:modello-plugin-jackson) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-java) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-jdom) = %{version}
+BuildRequires: mvn(org.codehaus.modello:modello-plugin-jsonschema) =
%{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-sax) = %{version}
+BuildRequires: mvn(org.codehaus.modello:modello-plugin-snakeyaml) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-stax) = %{version}
+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}
@@ -88,35 +92,24 @@
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :sisu-maven-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_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core
+%pom_change_dep -r :velocity-engine-core :velocity
%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}
+%{mvn_file} :{*} %{parent}/@1
%{mvn_build} -f -- -Dsource=8
popd
%install
pushd %{name}
+
%mvn_install
+
popd
%fdupes -s %{buildroot}%{_javadocdir}
++++++ modello.spec ++++++
--- /var/tmp/diff_new_pack.gWiDm0/_old 2024-04-17 16:24:50.017629101 +0200
+++ /var/tmp/diff_new_pack.gWiDm0/_new 2024-04-17 16:24:50.021629248 +0200
@@ -35,33 +35,39 @@
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-containers-component-annotations
+BuildRequires: plexus-compiler
BuildRequires: plexus-utils
BuildRequires: plexus-xml
BuildRequires: sisu-inject
BuildRequires: sisu-plexus
BuildRequires: slf4j
+BuildRequires: snakeyaml
BuildRequires: unzip
+BuildRequires: velocity
Requires: aopalliance
Requires: atinject
Requires: google-guice
Requires: guava
+Requires: jackson-core
Requires: javadoc-parser
Requires: javapackages-tools
Requires: plexus-build-api
Requires: plexus-classworlds
-Requires: plexus-containers-component-annotations
Requires: plexus-utils
Requires: plexus-xml
Requires: sisu-inject
Requires: sisu-plexus
Requires: slf4j
+Requires: snakeyaml
+Requires: velocity
BuildArch: noarch
%description
@@ -73,6 +79,16 @@
from the single model, including Java POJOs, XML
marshallers/unmarshallers, XSD and documentation.
+%package test
+Summary: Modello Test Package
+Group: Development/Libraries/Java
+Requires: %{name} = %{version}
+
+%description test
+Modello Test Package contains the basis to create Modello generator
+unit-tests, including sample models and xml files to test every
+feature for every plugin.
+
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Libraries/Java
@@ -93,20 +109,10 @@
%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
+# This builds correctly with the older velocity 1.x and avoids build cycles
+%pom_change_dep -r :velocity-engine-core :velocity
-%pom_disable_module modello-test
+%pom_remove_dep :jackson-bom
%build
mkdir -p lib
@@ -115,17 +121,21 @@
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 \
plexus/utils \
plexus/xml \
- plexus-containers/plexus-component-annotations \
- slf4j/api
+ slf4j/api \
+ snakeyaml \
+ velocity
%{ant} \
-Dtest.skip=true \
@@ -134,37 +144,23 @@
%install
# jars
install -dm 0755 %{buildroot}%{_javadir}/%{name}
-
-for i in core; do
- install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar
%{buildroot}%{_javadir}/%{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}/target/%{name}-plugin-${i}-%{version}.jar
%{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar
-done
-
# poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-
-for i in core; do
- %{mvn_install_pom} %{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
- %{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; do
+for i in core test; do
+ install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar
%{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
+ %{mvn_install_pom} %{name}-${i}/pom.xml
%{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom
+ %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar -f ${i}
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
cp -pr %{name}-${i}/target/site/apidocs/*
%{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
done
-for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do
+for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd jackson
jsonschema snakeyaml velocity; do
+ install -pm 0644
%{name}-plugins/%{name}-plugin-${i}/target/%{name}-plugin-${i}-%{version}.jar
%{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar
+ %{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
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}
cp -pr %{name}-plugins/%{name}-plugin-${i}/target/site/apidocs/*
%{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}/
done
@@ -172,12 +168,15 @@
%fdupes -s %{buildroot}%{_javadocdir}
# script
-%jpackage_script org.codehaus.modello.ModelloCli "" ""
modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject: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
%{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:guava:slf4j/api:slf4j/simple:snakeyaml:velocity
%{name} true
-%files -f .mfiles
+%files -f .mfiles -f .mfiles-core
%license LICENSE
%{_bindir}/*
+%files test -f .mfiles-test
+%license LICENSE
+
%files javadoc
%license LICENSE
%{_javadocdir}/%{name}
++++++ modello-build.tar.xz ++++++
++++ 1622 lines of diff (skipped)
