Hello community, here is the log from the commit of package plexus-containers for openSUSE:Factory checked in at 2019-03-26 15:43:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plexus-containers (Old) and /work/SRC/openSUSE:Factory/.plexus-containers.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-containers" Tue Mar 26 15:43:50 2019 rev:2 rq:687912 version:1.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/plexus-containers/plexus-containers.changes 2019-03-22 14:58:52.869888192 +0100 +++ /work/SRC/openSUSE:Factory/.plexus-containers.new.25356/plexus-containers.changes 2019-03-26 15:44:19.392156787 +0100 @@ -1,0 +2,10 @@ +Fri Mar 22 21:34:55 UTC 2019 - Fridrich Strba <[email protected]> + +- Add another spec file to build plexus-metadata-generator in order + to be able to generate plexus components.xml descriptor +- Added patch: + * plexus-metadata-generator-nomojo.patch + + Allow building this command-line tool without needing to use + exceptions defined in maven-plugin-api + +------------------------------------------------------------------- New Changes file: --- /dev/null 2018-10-29 14:05:42.522318975 +0100 +++ /work/SRC/openSUSE:Factory/.plexus-containers.new.25356/plexus-metadata-generator.changes 2019-03-26 15:44:19.672156459 +0100 @@ -0,0 +1,27 @@ +------------------------------------------------------------------- +Sat Mar 23 08:40:02 UTC 2019 - Jan Engelhardt <[email protected]> + +- plexus-metadata-generator.spec: Describe package, not project. + +------------------------------------------------------------------- +Fri Mar 22 21:34:55 UTC 2019 - Fridrich Strba <[email protected]> + +- Add another spec file to build plexus-metadata-generator in order + to be able to generate plexus components.xml descriptor +- Added patch: + * plexus-metadata-generator-nomojo.patch + + Allow building this command-line tool without needing to use + exceptions defined in maven-plugin-api + +------------------------------------------------------------------- +Sun Mar 3 18:20:04 UTC 2019 - Jan Engelhardt <[email protected]> + +- Describe package, not project. + +------------------------------------------------------------------- +Sat Mar 2 13:22:53 UTC 2019 - Fridrich Strba <[email protected]> + +- Initial packaging of plexus-containers 1.7.1 +- Generate and customize ant build files +- Leave out the plexus-component-metadata that will be built + by a different spec file New: ---- plexus-metadata-generator-nomojo.patch plexus-metadata-generator.changes plexus-metadata-generator.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plexus-containers.spec ++++++ --- /var/tmp/diff_new_pack.c6g1cd/_old 2019-03-26 15:44:20.436155564 +0100 +++ /var/tmp/diff_new_pack.c6g1cd/_new 2019-03-26 15:44:20.444155555 +0100 @@ -38,10 +38,10 @@ BuildRequires: guava20 BuildRequires: javapackages-local BuildRequires: junit -BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) 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 @@ -150,9 +150,6 @@ # integration tests fix sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|" plexus-component-javadoc/src/it/basic/pom.xml -# plexus-component-api has been merged into plexus-container-default -# %{mvn_alias} ":plexus-container-default" "org.codehaus.plexus:containers-component-api" - %build for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do pushd ${i} ++++++ plexus-metadata-generator.spec ++++++ # # spec file for package plexus-metadata-generator # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global base_name plexus-containers %global comp_name component-metadata %bcond_with tests Name: plexus-metadata-generator Version: 1.7.1 Release: 0 Summary: Component metadata from %{base_name} # Most of the files are either under ASL 2.0 or MIT # The following files are under xpp: # plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java # plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java License: Apache-2.0 AND MIT AND xpp Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-containers Source0: https://github.com/codehaus-plexus/%{base_name}/archive/%{base_name}-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT Source100: %{base_name}-build.tar.xz Patch0: 0001-Port-to-current-qdox.patch Patch1000: %{name}-nomojo.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: fdupes BuildRequires: javapackages-local BuildRequires: jdom2 BuildRequires: junit BuildRequires: objectweb-asm BuildRequires: plexus-classworlds BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils BuildRequires: qdox >= 2 BuildRequires: xbean BuildConflicts: java-devel >= 9 Requires: apache-commons-cli Requires: guava20 Requires: jdom2 Requires: objectweb-asm Requires: plexus-cli Requires: plexus-containers-component-annotations = %{version} Requires: plexus-containers-container-default = %{version} Requires: plexus-utils Requires: qdox >= 2 Requires: xbean BuildArch: noarch %if %{with tests} BuildRequires: ant-junit %endif %description Plexus contains end-to-end developer tools for writing applications. At the core is the container, which can be embedded or for an application server. There are many reusable components for hibernate, form processing, jndi, i18n, velocity, etc. Plexus also includes an application server which is like a J2EE application server. %package javadoc Summary: API documentation for %{name} Group: Documentation/HTML %description javadoc %{summary}. %prep %setup -q -n %{base_name}-%{base_name}-%{version} -a100 mkdir -p lib build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils jdom2/jdom2 commons-cli qdox plexus/cli %if %{with tests} build-jar-repository -s lib hamcrest/core %endif %patch0 -p1 %patch1000 -p1 cp %{SOURCE1} . cp %{SOURCE2} . rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy %pom_remove_plugin -r :maven-site-plugin # For Maven 3 compat %pom_add_dep org.apache.maven:maven-core plexus-component-metadata %pom_change_dep -r :google-collections com.google.guava:guava:20.0 # ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default %pom_remove_dep com.sun:tools plexus-component-javadoc %pom_add_dep com.sun:tools plexus-component-javadoc # Generate OSGI info %pom_xpath_inject "pom:project" " <packaging>bundle</packaging> <build> <plugins> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> <configuration> <instructions> <_nouses>true</_nouses> <Export-Package>org.codehaus.plexus.component.annotations.*</Export-Package> </instructions> </configuration> </plugin> </plugins> </build>" plexus-component-annotations # to prevent ant from failing mkdir -p plexus-component-annotations/src/test/java # integration tests fix sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|" plexus-component-javadoc/src/it/basic/pom.xml rm -rf plexus-%{comp_name}/src/main/java/org/codehaus/plexus/maven rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven %pom_remove_dep :maven-core plexus-%{comp_name} %pom_remove_dep :maven-model plexus-%{comp_name} %pom_remove_dep :maven-plugin-api plexus-%{comp_name} %pom_remove_dep :maven-project plexus-%{comp_name} %pom_remove_dep :maven-plugin-annotations plexus-%{comp_name} %pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name} %build pushd plexus-%{comp_name} ant \ -f generator-build.xml \ %if %{without tests} -Dtest.skip=true \ %endif jar javadoc popd %install # jar install -dm 0755 %{buildroot}%{_javadir} install -pm 0644 plexus-%{comp_name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} install -pm 0644 plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} 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} %files -f .mfiles %license LICENSE-2.0.txt LICENSE.MIT %{_bindir}/%{name} %files javadoc %license LICENSE-2.0.txt LICENSE.MIT %{_javadocdir}/%{name} %changelog ++++++ plexus-containers-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plexus-component-metadata/generator-build.xml new/plexus-component-metadata/generator-build.xml --- old/plexus-component-metadata/generator-build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/plexus-component-metadata/generator-build.xml 2019-03-07 08:37:43.088358768 +0100 @@ -0,0 +1,225 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="plexus-component-metadata" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="plexus-metadata-generator"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + <property name="build.testOutputDir" value="${build.dir}/test-classes"/> + <property name="build.testDir" value="src/test/java"/> + <property name="build.testResourceDir" value="src/test/resources"/> + <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../plexus-container-default/target/classes"/> + <pathelement location="../plexus-component-annotations/target/classes"/> + <fileset dir="../lib"> + <!-- qdox-2.0-M5 commons-cli-1.2 plexus-cli-1.6 plexus-utils-3.0.20 + jdom2-2.0.6 asm-all-5.1 --> + <include name="**/*"/> + </fileset> + </path> + <path id="build.test.classpath"> + <pathelement location="../plexus-container-default/target/classes"/> + <pathelement location="../plexus-component-annotations/target/classes"/> + <fileset dir="../lib"> + <!-- qdox-2.0-M5 commons-cli-1.2 plexus-cli-1.6 plexus-utils-3.0.20 + jdom2-2.0.6 asm-all-5.1 + junit-4.12 hamcrest-core-1.3 --> + <include name="**/*"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"/> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="test.skip"> + <mkdir dir="${build.testOutputDir}"/> + <javac destdir="${build.testOutputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.testDir}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + </javac> + <copy todir="${build.testOutputDir}"> + <fileset dir="${build.testResourceDir}"/> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + <pathelement location="${build.testOutputDir}"/> + </classpath> + <batchtest todir="${test.reports}" unless="test"> + <fileset dir="${build.testDir}"> + <include name="**/Test*.java"/> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + <batchtest todir="${test.reports}" if="test"> + <fileset dir="${build.testDir}"> + <include name="**/${test}.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + classpathref="build.classpath" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"/> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Main-Class" value="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> ++++++ plexus-metadata-generator-nomojo.patch ++++++ --- plexus-containers-plexus-containers-1.7.1/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java 2016-08-31 21:01:49.000000000 +0200 +++ plexus-containers-plexus-containers-1.7.1/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java 2019-03-07 07:59:40.878835988 +0100 @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.plugin.MojoExecutionException; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.repository.ComponentDescriptor; import org.codehaus.plexus.metadata.gleaner.AnnotationComponentGleaner; @@ -95,15 +94,8 @@ // Add the projects dependencies for ( String filename : elements ) { - try - { list.add( new File( filename ).toURI().toURL() ); } - catch ( MalformedURLException e ) - { - throw new MojoExecutionException( "Invalid classpath entry: " + filename, e ); - } - } URL[] urls = list.toArray( new URL[list.size()] );
