Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sbt for openSUSE:Factory checked in at 2023-05-04 17:10:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbt (Old) and /work/SRC/openSUSE:Factory/.sbt.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbt" Thu May 4 17:10:10 2023 rev:15 rq:1084310 version:0.13.18 Changes: -------- --- /work/SRC/openSUSE:Factory/sbt/sbt.changes 2022-08-02 22:08:52.421717447 +0200 +++ /work/SRC/openSUSE:Factory/.sbt.new.1533/sbt.changes 2023-05-04 17:10:23.580301186 +0200 @@ -1,0 +2,8 @@ +Wed May 3 11:43:15 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Fix build against maven 3.9.1 +- Added patch: + * sbt-maven-resolver.patch + + stubs to cater for new interface methods in maven-resolver + +------------------------------------------------------------------- New: ---- sbt-maven-resolver.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbt.spec ++++++ --- /var/tmp/diff_new_pack.IFq8PX/_old 2023-05-04 17:10:24.992309454 +0200 +++ /var/tmp/diff_new_pack.IFq8PX/_new 2023-05-04 17:10:25.000309501 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -102,6 +102,7 @@ Patch2: sbt-0.13.17-lines.patch Patch3: sbt-new-ivy.patch Patch4: sbt-0.13.13-sxr.patch +Patch5: sbt-maven-resolver.patch BuildRequires: apache-ivy #Source650: https://oss.sonatype.org/service/local/repositories/releases/content/org/scala-sbt/sbt-giter8-resolver/sbt-giter8-resolver_%{scala_short_version}/0.1.0/sbt-giter8-resolver_%{scala_short_version}-0.1.0.jar #Source660: https://oss.sonatype.org/service/local/repositories/releases/content/org/foundweekends/giter8/giter8_%{scala_short_version}/0.7.1/giter8_%{scala_short_version}-0.7.1.jar @@ -330,6 +331,8 @@ %patch4 -p1 %endif +%patch5 -p1 + sed -i -e '/% "test"/d' project/Util.scala cp %{SOURCE15} . @@ -375,27 +378,27 @@ ./climbing-nemesis.py org.codehaus.plexus plexus-classworlds %{ivy_local_dir} --version 2.5.2 ./climbing-nemesis.py org.codehaus.plexus plexus-utils %{ivy_local_dir} --version 3.0.22 ./climbing-nemesis.py org.eclipse.aether aether-api %{ivy_local_dir} --version 1.3.1 -./climbing-nemesis.py org.apache.maven.resolver maven-resolver-api %{ivy_local_dir} --version 1.7.3 +./climbing-nemesis.py org.apache.maven.resolver maven-resolver-api %{ivy_local_dir} --version 1.9.8 ./climbing-nemesis.py org.eclipse.aether aether-spi %{ivy_local_dir} --version 1.3.1 -./climbing-nemesis.py org.apache.maven.resolver maven-resolver-spi %{ivy_local_dir} --version 1.7.3 +./climbing-nemesis.py org.apache.maven.resolver maven-resolver-spi %{ivy_local_dir} --version 1.9.8 ./climbing-nemesis.py org.eclipse.aether aether-util %{ivy_local_dir} --version 1.3.1 -./climbing-nemesis.py org.apache.maven.resolver maven-resolver-util %{ivy_local_dir} --version 1.7.3 +./climbing-nemesis.py org.apache.maven.resolver maven-resolver-util %{ivy_local_dir} --version 1.9.8 ./climbing-nemesis.py org.apache.maven maven-model %{ivy_local_dir} --version 3.2.3 -./climbing-nemesis.py org.apache.maven maven-model %{ivy_local_dir} --version 3.8.6 +./climbing-nemesis.py org.apache.maven maven-model %{ivy_local_dir} --version 3.9.1 ./climbing-nemesis.py org.apache.maven maven-model-builder %{ivy_local_dir} --version 3.2.3 -./climbing-nemesis.py org.apache.maven maven-model-builder %{ivy_local_dir} --version 3.8.6 +./climbing-nemesis.py org.apache.maven maven-model-builder %{ivy_local_dir} --version 3.9.1 ./climbing-nemesis.py org.apache.maven maven-repository-metadata %{ivy_local_dir} --version 3.2.3 -./climbing-nemesis.py org.apache.maven maven-repository-metadata %{ivy_local_dir} --version 3.8.6 -./climbing-nemesis.py org.apache.maven maven-builder-support %{ivy_local_dir} --version 3.8.6 -./climbing-nemesis.py org.apache.maven maven-artifact %{ivy_local_dir} --version 3.8.6 -./climbing-nemesis.py org.codehaus.plexus plexus-utils %{ivy_local_dir} --version 3.3.1 +./climbing-nemesis.py org.apache.maven maven-repository-metadata %{ivy_local_dir} --version 3.9.1 +./climbing-nemesis.py org.apache.maven maven-builder-support %{ivy_local_dir} --version 3.9.1 +./climbing-nemesis.py org.apache.maven maven-artifact %{ivy_local_dir} --version 3.9.1 +./climbing-nemesis.py org.codehaus.plexus plexus-utils %{ivy_local_dir} --version 3.5.1 ./climbing-nemesis.py org.codehaus.plexus plexus-interpolation %{ivy_local_dir} --version 1.26 ./climbing-nemesis.py org.eclipse.sisu org.eclipse.sisu.inject %{ivy_local_dir} --version 0.3.0.M1 --ignore "cdi-api" ./climbing-nemesis.py org.eclipse.sisu org.eclipse.sisu.inject %{ivy_local_dir} --version 0.3.3 --ignore "cdi-api" ./climbing-nemesis.py org.eclipse.sisu org.eclipse.sisu.inject %{ivy_local_dir} --version 0.3.5 --ignore "cdi-api" ./climbing-nemesis.py org.slf4j slf4j-api %{ivy_local_dir} --version 1.7.25 -./climbing-nemesis.py org.slf4j slf4j-api %{ivy_local_dir} --version 1.7.32 +./climbing-nemesis.py org.slf4j slf4j-api %{ivy_local_dir} --version 1.7.36 ./climbing-nemesis.py javax.annotation javax.annotation-api %{ivy_local_dir} --version 1.3.2 @@ -404,9 +407,9 @@ ./climbing-nemesis.py javax.inject javax.inject %{ivy_local_dir} --version 1 --override javax.inject:javax.inject ./climbing-nemesis.py org.eclipse.sisu org.eclipse.sisu.plexus %{ivy_local_dir} --version 0.3.0.M1 ./climbing-nemesis.py org.eclipse.aether aether-impl %{ivy_local_dir} --version 1.0.1.v20141111 -./climbing-nemesis.py org.apache.maven.resolver maven-resolver-impl %{ivy_local_dir} --version 1.7.3 -./climbing-nemesis.py org.apache.maven.resolver maven-resolver-impl %{ivy_local_dir} --version 1.6.3 -./climbing-nemesis.py org.apache.maven.resolver maven-resolver-named-locks %{ivy_local_dir} --version 1.7.3 +./climbing-nemesis.py org.apache.maven.resolver maven-resolver-impl %{ivy_local_dir} --version 1.9.8 +./climbing-nemesis.py org.apache.maven.resolver maven-resolver-impl %{ivy_local_dir} --version 1.9.7 +./climbing-nemesis.py org.apache.maven.resolver maven-resolver-named-locks %{ivy_local_dir} --version 1.9.8 ./climbing-nemesis.py org.eclipse.aether aether-connector-basic %{ivy_local_dir} --version 1.0.1.v20141111 ./climbing-nemesis.py org.apache.maven maven-aether-provider %{ivy_local_dir} --version 3.2.3 ++++++ sbt-maven-resolver.patch ++++++ --- sbt-0.13.18/sbt-maven-resolver/src/main/scala/sbt/mavenint/SbtRepositoryLayout.scala 2018-11-28 11:34:11.000000000 +0100 +++ sbt-0.13.18/sbt-maven-resolver/src/main/scala/sbt/mavenint/SbtRepositoryLayout.scala 2023-05-02 20:34:15.106447094 +0200 @@ -6,7 +6,7 @@ import org.eclipse.aether.artifact.Artifact import org.eclipse.aether.metadata.Metadata import org.eclipse.aether.repository.RemoteRepository -import org.eclipse.aether.spi.connector.layout.RepositoryLayout.Checksum +import org.eclipse.aether.spi.connector.layout.RepositoryLayout.ChecksumLocation import org.eclipse.aether.spi.connector.layout.{ RepositoryLayout, RepositoryLayoutFactory } import org.eclipse.aether.transfer.NoRepositoryLayoutException @@ -87,11 +87,12 @@ } // TODO - This should be the same as configured from Ivy... - def getChecksums(artifact: Artifact, upload: Boolean, location: URI): java.util.List[Checksum] = - getChecksums(location) - def getChecksums(metadata: Metadata, upload: Boolean, location: URI): java.util.List[Checksum] = - getChecksums(location) - - private def getChecksums(location: URI): java.util.List[Checksum] = - java.util.Arrays.asList(Checksum.forLocation(location, "SHA-1"), Checksum.forLocation(location, "MD5")) + def getChecksumLocations(artifact: Artifact, upload: Boolean, location: URI): java.util.List[ChecksumLocation] = + java.util.Arrays.asList() + def getChecksumLocations(metadata: Metadata, upload: Boolean, location: URI): java.util.List[ChecksumLocation] = + java.util.Arrays.asList() + + def getChecksumAlgorithmFactories(): java.util.List[org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory] = + java.util.Arrays.asList() + def hasChecksums(x$1: org.eclipse.aether.artifact.Artifact): Boolean = false } \ No newline at end of file
