Hello community, here is the log from the commit of package plexus-containers for openSUSE:Factory checked in at 2019-04-11 12:19:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plexus-containers (Old) and /work/SRC/openSUSE:Factory/.plexus-containers.new.27019 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-containers" Thu Apr 11 12:19:44 2019 rev:4 rq:693100 version:1.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/plexus-containers/plexus-containers.changes 2019-03-26 15:44:19.392156787 +0100 +++ /work/SRC/openSUSE:Factory/.plexus-containers.new.27019/plexus-containers.changes 2019-04-11 12:19:48.541005864 +0200 @@ -1,0 +2,6 @@ +Tue Apr 9 17:10:35 UTC 2019 - Fridrich Strba <[email protected]> + +- Remove references to parent poms since we are not building with + Maven. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/plexus-containers/plexus-metadata-generator.changes 2019-03-26 15:44:19.672156459 +0100 +++ /work/SRC/openSUSE:Factory/.plexus-containers.new.27019/plexus-metadata-generator.changes 2019-04-11 12:19:49.141006121 +0200 @@ -1,0 +2,7 @@ +Tue Apr 9 17:17:04 UTC 2019 - Fridrich Strba <[email protected]> + +- Remove reference to parent pom, since we are not building with + Maven. +- Clean the classpath of the script to include only neede jars + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plexus-containers.spec ++++++ --- /var/tmp/diff_new_pack.ETsMnK/_old 2019-04-11 12:19:52.181007419 +0200 +++ /var/tmp/diff_new_pack.ETsMnK/_new 2019-04-11 12:19:52.225007438 +0200 @@ -41,9 +41,7 @@ BuildRequires: plexus-classworlds BuildRequires: plexus-utils BuildRequires: xbean -BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildConflicts: java-devel >= 9 -Requires: mvn(org.codehaus.plexus:plexus:pom:) BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -61,7 +59,6 @@ Summary: Javadoc component from %{name} Group: Development/Libraries/Java Requires: mvn(com.sun:tools) -Requires: mvn(org.codehaus.plexus:plexus-containers:pom:) %description component-javadoc %{summary}. @@ -69,7 +66,6 @@ %package component-annotations Summary: Component API from %{name} Group: Development/Libraries/Java -Requires: mvn(org.codehaus.plexus:plexus-containers:pom:) %description component-annotations %{summary}. @@ -80,7 +76,6 @@ Requires: mvn(com.google.guava:guava:20.0) Requires: mvn(org.apache.xbean:xbean-reflect) Requires: mvn(org.codehaus.plexus:plexus-classworlds) -Requires: mvn(org.codehaus.plexus:plexus-containers:pom:) Requires: mvn(org.codehaus.plexus:plexus-utils) Requires: mvn(org.ow2.asm:asm) Requires: mvn(org.ow2.asm:asm-commons) @@ -153,6 +148,8 @@ %build for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do pushd ${i} + %pom_remove_parent . + %pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId><version>%{version}</version>" . ant \ %if %{without tests} -Dtest.skip=true \ @@ -173,11 +170,9 @@ # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus-containers.pom for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom done -%add_maven_depmap %{name}/plexus-containers.pom %add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations %add_maven_depmap %{name}/plexus-component-javadoc.pom %{name}/plexus-component-javadoc.jar -f component-javadoc %add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api @@ -189,10 +184,6 @@ done %fdupes -s %{buildroot}%{_javadocdir} -# plexus-containers pom goes into main package -%files -f .mfiles -%license LICENSE-2.0.txt LICENSE.MIT - %files component-annotations -f .mfiles-component-annotations %license LICENSE-2.0.txt LICENSE.MIT %{_javadir}/plexus ++++++ plexus-metadata-generator.spec ++++++ --- /var/tmp/diff_new_pack.ETsMnK/_old 2019-04-11 12:19:52.361007496 +0200 +++ /var/tmp/diff_new_pack.ETsMnK/_new 2019-04-11 12:19:52.361007496 +0200 @@ -146,6 +146,11 @@ %pom_remove_dep :maven-project plexus-%{comp_name} %pom_remove_dep :maven-plugin-annotations plexus-%{comp_name} +%pom_remove_parent plexus-%{comp_name} +%pom_xpath_inject "pom:project" " + <groupId>org.codehaus.plexus</groupId> + <version>%{version}</version> +" plexus-%{comp_name} %pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name} %build @@ -171,7 +176,7 @@ cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}:objectweb-asm/asm:objectweb-asm/asm-commons:plexus/classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava20/guava-20.0:xbean/xbean-reflect %{name} +%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava20/guava-20.0:xbean/xbean-reflect %{name} %files -f .mfiles %license LICENSE-2.0.txt LICENSE.MIT
