Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sbt for openSUSE:Factory checked in
at 2022-03-29 21:07:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sbt (Old)
and /work/SRC/openSUSE:Factory/.sbt.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbt"
Tue Mar 29 21:07:00 2022 rev:11 rq:965693 version:0.13.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/sbt/sbt.changes 2022-03-14 19:37:15.090139700
+0100
+++ /work/SRC/openSUSE:Factory/.sbt.new.1900/sbt.changes 2022-03-29
21:07:16.073130687 +0200
@@ -1,0 +2,13 @@
+Mon Mar 28 09:19:02 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * sbt-new-ivy.patch
+ + fix build against apache-ivy 2.5.0
+
+-------------------------------------------------------------------
+Tue Mar 22 12:04:17 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Override javax.inject:javax:inject artifact coordinates in order
+ to be able to build against newer atinject versions if needed
+
+-------------------------------------------------------------------
New:
----
sbt-new-ivy.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sbt.spec ++++++
--- /var/tmp/diff_new_pack.kVPIpk/_old 2022-03-29 21:07:18.053132406 +0200
+++ /var/tmp/diff_new_pack.kVPIpk/_new 2022-03-29 21:07:18.057132409 +0200
@@ -99,6 +99,7 @@
Source171: %{sbt_ivy_descriptor sbt}
Patch0: sbt-%{sbt_version}-build-sbt.patch
Patch2: sbt-0.13.17-lines.patch
+Patch3: sbt-new-ivy.patch
Patch4: sbt-0.13.13-sxr.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
@@ -325,6 +326,7 @@
%endif
%patch2 -p1
+%patch3 -p1
%if !%{do_proper}
%patch4 -p1
@@ -408,7 +410,7 @@
./climbing-nemesis.py com.google.guava guava %{ivy_local_dir} --version 18.0
--ignore "jsr305"
./climbing-nemesis.py com.google.code.findbugs jsr305 %{ivy_local_dir}
--version 1.3.9
-./climbing-nemesis.py javax.inject javax.inject %{ivy_local_dir} --version 1
+./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
++++++ sbt-new-ivy.patch ++++++
--- sbt-0.13.18/ivy/src/main/scala/sbt/FakeResolver.scala 2022-03-19
23:48:04.958817277 +0100
+++ sbt-0.13.18/ivy/src/main/scala/sbt/FakeResolver.scala 2022-03-19
23:59:45.280239339 +0100
@@ -149,10 +149,10 @@
new RevisionEntry(module, v)
}.toArray
- override def listTokenValues(tokens: Array[String], criteria:
java.util.Map[_, _]): Array[java.util.Map[_, _]] =
+ override def listTokenValues(tokens: Array[String], criteria:
java.util.Map[String, Object]): Array[java.util.Map[String, String]] =
Array.empty
- override def listTokenValues(token: String, otherTokenValues:
java.util.Map[_, _]): Array[String] =
+ override def listTokenValues(token: String, otherTokenValues:
java.util.Map[String, String]): Array[String] =
Array.empty
override def locate(art: IvyArtifact): ArtifactOrigin = {
--- sbt-0.13.18/ivy/src/main/scala/sbt/IvyScala.scala 2022-03-19
23:48:04.958817277 +0100
+++ sbt-0.13.18/ivy/src/main/scala/sbt/IvyScala.scala 2022-03-19
23:49:53.052539689 +0100
@@ -162,7 +162,7 @@
private[sbt] def excludeRule(organization: String, name: String,
configurationNames: Iterable[String], excludeTypePattern: String): ExcludeRule =
{
val artifact = new ArtifactId(ModuleId.newInstance(organization, name),
"*", excludeTypePattern, "*")
- val rule = new DefaultExcludeRule(artifact,
ExactPatternMatcher.INSTANCE, emptyMap[AnyRef, AnyRef])
+ val rule = new DefaultExcludeRule(artifact,
ExactPatternMatcher.INSTANCE, emptyMap[String, String])
configurationNames.foreach(rule.addConfiguration)
rule
}
---
sbt-0.13.18/sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala
2022-03-19 23:48:05.034815675 +0100
+++
sbt-0.13.18/sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala
2022-03-20 00:07:58.037948041 +0100
@@ -380,7 +380,7 @@
case other => other
}
// Here we add the classifier, hopefully correctly...
- val extraAtt = new java.util.HashMap[String, AnyRef]()
+ val extraAtt = new java.util.HashMap[String, String]()
if (d.getArtifact.getClassifier != null) {
extraAtt.put("m:classifier", d.getArtifact.getClassifier)
}
