Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plexus-resources for openSUSE:Factory checked in at 2024-10-08 17:24:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plexus-resources (Old) and /work/SRC/openSUSE:Factory/.plexus-resources.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plexus-resources" Tue Oct 8 17:24:44 2024 rev:5 rq:1206235 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plexus-resources/plexus-resources.changes 2024-05-27 12:03:59.299833050 +0200 +++ /work/SRC/openSUSE:Factory/.plexus-resources.new.19354/plexus-resources.changes 2024-10-08 17:25:52.936718493 +0200 @@ -1,0 +2,10 @@ +Tue Oct 8 06:40:30 UTC 2024 - Fridrich Strba <fstrba@suse.com> + +- Update to version 1.3 + * Changes: + * Ignore mac os .DS_Store + * Update codebase to current Java level + * Restore public constructor to DefaultResourceManager +- Fetch sources using source service + +------------------------------------------------------------------- Old: ---- plexus-resources-1.0-alpha-7-src.tar.xz New: ---- _service plexus-resources-1.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plexus-resources.spec ++++++ --- /var/tmp/diff_new_pack.bJhgar/_old 2024-10-08 17:25:53.452740029 +0200 +++ /var/tmp/diff_new_pack.bJhgar/_new 2024-10-08 17:25:53.456740196 +0200 @@ -16,26 +16,23 @@ # -%global base_ver 1.0 -%global alpha_ver 7 -%global namedversion %{base_ver}-alpha-%{alpha_ver} Name: plexus-resources -Version: %{base_ver}~a%{alpha_ver} +Version: 1.3.0 Release: 0 Summary: Plexus Resource Manager License: MIT Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-resources -# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-resources-1.0-a... -# tar caf plexus-resources-1.0-alpha-7-src.tar.xz plexus-resources-1.0-alpha-7 -Source0: %{name}-%{namedversion}-src.tar.xz +Source0: %{name}-%{version}.tar.xz Source1: %{name}-build.xml BuildRequires: ant +BuildRequires: atinject BuildRequires: fdupes BuildRequires: javapackages-local >= 6 -BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils -BuildRequires: sisu-plexus +BuildRequires: plexus-xml +BuildRequires: sisu-inject +BuildRequires: slf4j BuildArch: noarch %description @@ -53,19 +50,18 @@ API documentation for %{name}. %prep -%setup -q -n %{name}-%{namedversion} +%setup -q cp %{SOURCE1} build.xml -%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2 %build mkdir -p lib -build-jar-repository -s lib plexus/utils org.eclipse.sisu.plexus +build-jar-repository -s lib atinject org.eclipse.sisu.inject plexus/utils plexus/xml slf4j/api %{ant} jar javadoc %install # jar install -dm 0755 %{buildroot}%{_javadir}/plexus -install -pm 0644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/plexus/resources.jar +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/resources.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/resources.pom ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/codehaus-plexus/plexus-resources.git</param> <param name="revision">plexus-resources-1.3.0</param> <param name="match-tag">plexus-resources-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">plexus-resources-(.*)</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ plexus-resources-1.0-alpha-7-src.tar.xz -> plexus-resources-1.3.0.tar.xz ++++++ ++++ 2544 lines of diff (skipped) ++++++ plexus-resources-build.xml ++++++ --- /var/tmp/diff_new_pack.bJhgar/_old 2024-10-08 17:25:53.580745371 +0200 +++ /var/tmp/diff_new_pack.bJhgar/_new 2024-10-08 17:25:53.584745538 +0200 @@ -10,7 +10,7 @@ <property name="project.groupId" value="org.codehaus.plexus"/> <property name="project.artifactId" value="plexus-resources"/> - <property name="project.version" value="1.0-alpha-7"/> + <property name="project.version" value="1.3.0"/> <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> @@ -19,11 +19,7 @@ <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"/> <!-- ====================================================================== --> @@ -67,30 +63,28 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> </target> <!-- ====================================================================== --> - <!-- Target to generate Plexus component.xml --> + <!-- Sisu javax.inject.Named generation target --> <!-- ====================================================================== --> - <target name="generate-metadata" + <target name="sisu" depends="compile" - description="Generate Plexus component.xml"> - <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <exec executable="plexus-metadata-generator" failonerror="true"> - <env key="CLASSPATH" value="${build.outputDir}"/> - <arg value="-s"/> - <arg value="${build.srcDir}"/> - <arg value="-c"/> - <arg value="${build.outputDir}"/> - <arg value="-m"/> - <arg value="${build.outputDir}/META-INF/plexus"/> - <arg value="-o"/> - <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </exec> + description="Generate javax.inject.Name index"> + <sequential> + <java classname="org.eclipse.sisu.space.SisuIndex" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.classpath"/> + </classpath> + <arg value="${build.outputDir}"/> + </java> + <move todir="${build.outputDir}/META-INF"> + <fileset dir="META-INF"/> + </move> + </sequential> </target> <!-- ====================================================================== --> @@ -127,7 +121,7 @@ <!-- ====================================================================== --> <target name="package" - depends="generate-metadata" + depends="sisu" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true"