Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-resolver for openSUSE:Factory checked in at 2022-03-14 19:35:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-resolver (Old) and /work/SRC/openSUSE:Factory/.maven-resolver.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-resolver" Mon Mar 14 19:35:22 2022 rev:8 rq:961507 version:1.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-resolver/maven-resolver.changes 2022-01-13 23:22:16.140079970 +0100 +++ /work/SRC/openSUSE:Factory/.maven-resolver.new.25692/maven-resolver.changes 2022-03-14 19:37:11.198135034 +0100 @@ -1,0 +2,6 @@ +Fri Mar 11 12:10:26 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to upstream version 1.7.3 + * Change of API and incompatible with maven-resolver < 1.7 + +------------------------------------------------------------------- Old: ---- maven-resolver-1.6.3-source-release.zip New: ---- maven-resolver-1.7.3-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-resolver.spec ++++++ --- /var/tmp/diff_new_pack.s4hYiX/_old 2022-03-14 19:37:11.622135542 +0100 +++ /var/tmp/diff_new_pack.s4hYiX/_new 2022-03-14 19:37:11.626135547 +0100 @@ -19,18 +19,19 @@ %define _buildshell /bin/bash %bcond_with tests Name: maven-resolver -Version: 1.6.3 +Version: 1.7.3 Release: 0 Summary: Apache Maven Artifact Resolver library License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org/resolver/ +URL: https://maven.apache.org/resolver/ Source0: http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip Source1: %{name}-build.tar.xz BuildRequires: ant BuildRequires: apache-commons-lang3 BuildRequires: atinject BuildRequires: fdupes +BuildRequires: glassfish-annotation-api BuildRequires: google-guice BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core @@ -84,6 +85,13 @@ %description util A collection of utility classes to ease usage of the repository system. +%package named-locks +Summary: Maven Artifact Resolver Named Locks +Group: Development/Libraries/Java + +%description named-locks +A synchronization utility implementation using Named locks + %package impl Summary: Maven Artifact Resolver Implementation Group: Development/Libraries/Java @@ -143,14 +151,17 @@ %prep %setup -q -a1 -# pointless plugin -%pom_remove_plugin :maven-enforcer-plugin +# requires internet connection +rm maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java -# tests require jetty 7 -%pom_remove_dep :::test maven-resolver-transport-http -rm -r maven-resolver-transport-http/src/test +%pom_remove_plugin -r :bnd-maven-plugin +%pom_remove_plugin -r org.codehaus.mojo:animal-sniffer-maven-plugin +%pom_remove_plugin -r org.apache.maven.plugins:maven-enforcer-plugin %pom_disable_module maven-resolver-demos +%pom_disable_module maven-resolver-named-locks-hazelcast +%pom_disable_module maven-resolver-named-locks-redisson +%pom_disable_module maven-resolver-transport-classpath # generate OSGi manifests for pom in $(find -mindepth 2 -name pom.xml) ; do @@ -216,10 +227,10 @@ %endif package javadoc -%mvn_artifact pom.xml +%{mvn_artifact} pom.xml mkdir -p target/site/apidocs -for i in api spi test-util util impl connector-basic transport-classpath transport-file transport-http transport-wagon; do +for i in api spi test-util util named-locks impl connector-basic transport-classpath transport-file transport-http transport-wagon; do cp -r %{name}-${i}/target/site/apidocs target/site/apidocs/%{name}-${i} %{mvn_artifact} %{name}-${i}/pom.xml %{name}-${i}/target/%{name}-${i}-%{version}.jar done @@ -238,6 +249,8 @@ %files util -f .mfiles-util +%files named-locks -f .mfiles-named-locks + %files impl -f .mfiles-impl %files test-util -f .mfiles-test-util ++++++ maven-resolver-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2019-03-20 15:40:58.527214971 +0100 +++ new/build.xml 2022-03-11 11:45:43.420361538 +0100 @@ -11,6 +11,7 @@ <ant antfile="build.xml" dir="maven-resolver-spi" target="clean"/> <ant antfile="build.xml" dir="maven-resolver-test-util" target="clean"/> <ant antfile="build.xml" dir="maven-resolver-util" target="clean"/> + <ant antfile="build.xml" dir="maven-resolver-named-locks" target="clean"/> <ant antfile="build.xml" dir="maven-resolver-impl" target="clean"/> <ant antfile="build.xml" dir="maven-resolver-connector-basic" target="clean"/> <ant antfile="build.xml" dir="maven-resolver-transport-classpath" target="clean"/> @@ -28,6 +29,7 @@ <ant antfile="build.xml" dir="maven-resolver-spi" target="compile"/> <ant antfile="build.xml" dir="maven-resolver-test-util" target="compile"/> <ant antfile="build.xml" dir="maven-resolver-util" target="compile"/> + <ant antfile="build.xml" dir="maven-resolver-named-locks" target="compile"/> <ant antfile="build.xml" dir="maven-resolver-impl" target="compile"/> <ant antfile="build.xml" dir="maven-resolver-connector-basic" target="compile"/> <ant antfile="build.xml" dir="maven-resolver-transport-classpath" target="compile"/> @@ -45,6 +47,7 @@ <ant antfile="build.xml" dir="maven-resolver-spi" target="compile-tests"/> <ant antfile="build.xml" dir="maven-resolver-test-util" target="compile-tests"/> <ant antfile="build.xml" dir="maven-resolver-util" target="compile-tests"/> + <ant antfile="build.xml" dir="maven-resolver-named-locks" target="compile-tests"/> <ant antfile="build.xml" dir="maven-resolver-impl" target="compile-tests"/> <ant antfile="build.xml" dir="maven-resolver-connector-basic" target="compile-tests"/> <ant antfile="build.xml" dir="maven-resolver-transport-classpath" target="compile-tests"/> @@ -62,6 +65,7 @@ <ant antfile="build.xml" dir="maven-resolver-spi" target="test"/> <ant antfile="build.xml" dir="maven-resolver-test-util" target="test"/> <ant antfile="build.xml" dir="maven-resolver-util" target="test"/> + <ant antfile="build.xml" dir="maven-resolver-named-locks" target="test"/> <ant antfile="build.xml" dir="maven-resolver-impl" target="test"/> <ant antfile="build.xml" dir="maven-resolver-connector-basic" target="test"/> <ant antfile="build.xml" dir="maven-resolver-transport-classpath" target="test"/> @@ -79,6 +83,7 @@ <ant antfile="build.xml" dir="maven-resolver-spi" target="javadoc"/> <ant antfile="build.xml" dir="maven-resolver-test-util" target="javadoc"/> <ant antfile="build.xml" dir="maven-resolver-util" target="javadoc"/> + <ant antfile="build.xml" dir="maven-resolver-named-locks" target="javadoc"/> <ant antfile="build.xml" dir="maven-resolver-impl" target="javadoc"/> <ant antfile="build.xml" dir="maven-resolver-connector-basic" target="javadoc"/> <ant antfile="build.xml" dir="maven-resolver-transport-classpath" target="javadoc"/> @@ -96,6 +101,7 @@ <ant antfile="build.xml" dir="maven-resolver-spi" target="package"/> <ant antfile="build.xml" dir="maven-resolver-test-util" target="package"/> <ant antfile="build.xml" dir="maven-resolver-util" target="package"/> + <ant antfile="build.xml" dir="maven-resolver-named-locks" target="package"/> <ant antfile="build.xml" dir="maven-resolver-impl" target="package"/> <ant antfile="build.xml" dir="maven-resolver-connector-basic" target="package"/> <ant antfile="build.xml" dir="maven-resolver-transport-classpath" target="package"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2021-10-22 14:17:46.217840203 +0200 +++ new/common.xml 2022-03-11 11:18:03.017574193 +0100 @@ -3,15 +3,15 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="1.6.3"/> + <property name="project.version" value="1.7.3"/> <property name="project.groupId" value="org.apache.maven.resolver"/> <property name="project.url" value="https://maven.apache.org/resolver/"/> <property name="project.organization.name" value="The Apache Software Foundation"/> - <property name="spec.version" value="1.6"/> + <property name="spec.version" value="1.7"/> - <property name="compiler.source" value="1.7"/> + <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-resolver-impl/build.xml new/maven-resolver-impl/build.xml --- old/maven-resolver-impl/build.xml 2019-03-20 15:44:44.624346394 +0100 +++ new/maven-resolver-impl/build.xml 2022-03-11 11:46:34.100690956 +0100 @@ -33,6 +33,7 @@ <pathelement location="../maven-resolver-api/target/classes"/> <pathelement location="../maven-resolver-spi/target/classes"/> <pathelement location="../maven-resolver-util/target/classes"/> + <pathelement location="../maven-resolver-named-locks/target/classes"/> <fileset dir="../lib"> <!-- javax.inject-1 org.eclipse.sisu.inject-0.3.3 sisu-guice-3.2.6-no_aop slf4j-api-1.7.25 --> @@ -43,6 +44,7 @@ <pathelement location="../maven-resolver-api/target/classes"/> <pathelement location="../maven-resolver-spi/target/classes"/> <pathelement location="../maven-resolver-util/target/classes"/> + <pathelement location="../maven-resolver-named-locks/target/classes"/> <pathelement location="../maven-resolver-test-util/target/classes"/> <fileset dir="../lib"> <!-- javax.inject-1 org.eclipse.sisu.inject-0.3.3 sisu-guice-3.2.6-no_aop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-resolver-named-locks/build.xml new/maven-resolver-named-locks/build.xml --- old/maven-resolver-named-locks/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/maven-resolver-named-locks/build.xml 2022-03-11 11:41:03.378541273 +0100 @@ -0,0 +1,289 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="maven-resolver-named-locks" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="maven-resolver-named-locks"/> + <property name="project.name" value="Maven Artifact Resolver Named Locks"/> + <property name="project.description" + value="A synchronization utility implementation using Named locks"/> + + <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"> + <fileset dir="../lib"> + <!-- javax.inject-1 org.eclipse.sisu.inject-0.3.3 sisu-guice-3.2.6-no_aop + slf4j-api-1.7.25 --> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <pathelement location="../maven-resolver-test-util/target/classes"/> + <fileset dir="../lib"> + <!-- javax.inject-1 org.eclipse.sisu.inject-0.3.3 sisu-guice-3.2.6-no_aop + slf4j-api-1.7.25 slf4j-simple-1.7.25 junit-4.12 hamcrest-core-1.3 --> + <include name="**/*.jar"/> + </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> + </target> + + <!-- ====================================================================== --> + <!-- Sisu javax.inject.Named generation target --> + <!-- ====================================================================== --> + + <target name="sisu" + depends="compile" + 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> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="sisu" + 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" + source="${compiler.source}" + verbose="false" + locale="en" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + encoding="UTF-8" + linksource="true" + breakiterator="false"> + <classpath refid="build.classpath"/> + <group title="API"/> + <group title="SPI"/> + <group title="Utilities"/> + <group title="Repository Connectors"/> + <group title="Transporters"/> + <group title="Implementation"/> + <group title="Demo Maven Plugin"/> + <group title="Demo Snippets"/> + <group title="Internals"/> + <tag name="noextend" + scope="all" + description="Restriction:"/> + <tag name="noimplement" + scope="all" + description="Restriction:"/> + <tag name="noinstantiate" + scope="all" + description="Restriction:"/> + <tag name="nooverride" + scope="all" + description="Restriction:"/> + <tag name="noreference" + scope="all" + description="Restriction:"/> + <tag name="provisional" + scope="all" + description="Provisional:"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="sisu,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="Automatic-Module-Name" value="${project.groupId}.named"/> + <attribute name="Bundle-Description" value="${project.description}"/> + <attribute name="Bundle-DocURL" value="${project.url}${project.artifactId}/"/> + <attribute name="Bundle-License" value="https://www.apache.org/licenses/LICENSE-2.0.txt"/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="${project.name}"/> + <attribute name="Bundle-SymbolicName" value="${project.groupId}.named.locks"/> + <attribute name="Bundle-Vendor" value="${project.organization.name}"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="org.eclipse.aether.named.providers;version="${project.version}",org.eclipse.aether.named.support;version="${project.version}",org.eclipse.aether.named;version="${project.version}""/> + <attribute name="Implementation-Title" value="${project.name}"/> + <attribute name="Implementation-URL" value="${project.url}${project.artifactId}/"/> + <attribute name="Implementation-Vendor" value="${project.organization.name}"/> + <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> + <attribute name="Implementation-Version" value="${project.version}"/> + <attribute name="Import-Package" value="javax.inject;resolution:=optional,org.eclipse.aether.named,org.eclipse.aether.named.support,org.slf4j"/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + <attribute name="Specification-Title" value="${project.name}"/> + <attribute name="Specification-Vendor" value="${project.organization.name}"/> + <attribute name="Specification-Version" value="${spec.version}"/> + </manifest> + </jar> + </target> + +</project>
