Hello community, here is the log from the commit of package maven for openSUSE:Factory checked in at 2019-11-26 16:55:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven (Old) and /work/SRC/openSUSE:Factory/.maven.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven" Tue Nov 26 16:55:18 2019 rev:2 rq:750518 version:3.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/maven/maven.changes 2019-04-03 10:51:04.933926446 +0200 +++ /work/SRC/openSUSE:Factory/.maven.new.26869/maven.changes 2019-11-26 16:55:55.416175943 +0100 @@ -1,0 +2,15 @@ +Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 3.6.2 +- Modified patche: + * 0002-Invoke-logback-via-reflection.patch + + adapt to changed context +- Removed patch: + * 0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch + + we don't need this patch, since we are not running tests + by default +- Added patch: + * 0004-Use-non-shaded-HTTP-wagon.patch + + we don't use/distribute shared wagon-http + +------------------------------------------------------------------- Old: ---- 0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch apache-maven-3.5.4-src.tar.gz apache-maven-build.tar.xz New: ---- 0004-Use-non-shaded-HTTP-wagon.patch apache-maven-3.6.2-build.tar.xz apache-maven-3.6.2-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven.spec ++++++ --- /var/tmp/diff_new_pack.WynF9I/_old 2019-11-26 16:55:58.704174857 +0100 +++ /var/tmp/diff_new_pack.WynF9I/_new 2019-11-26 16:55:58.704174857 +0100 @@ -1,7 +1,7 @@ # # spec file for package maven # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix} %bcond_with logback Name: maven -Version: 3.5.4 +Version: 3.6.2 Release: 0 Summary: Java project management and project comprehension tool # maven itself is ASL 2.0 @@ -32,13 +32,12 @@ Source0: http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz Source1: maven-bash-completion Source2: mvn.1 -Source10: apache-%{name}-build.tar.xz +Source10: apache-%{name}-%{version}-build.tar.xz Patch1: 0001-Adapt-mvn-script.patch # Downstream-specific, avoids dependency on logback # Used only when %%without logback is in effect Patch2: 0002-Invoke-logback-via-reflection.patch -# We don't have mockito 2 yet -Patch3: 0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch +Patch4: 0004-Use-non-shaded-HTTP-wagon.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: apache-commons-codec @@ -71,7 +70,7 @@ BuildRequires: maven-wagon-http BuildRequires: maven-wagon-http-shared BuildRequires: maven-wagon-provider-api -BuildRequires: modello +BuildRequires: modello >= 1.10 BuildRequires: objectweb-asm BuildRequires: plexus-cipher BuildRequires: plexus-classworlds @@ -89,7 +88,8 @@ BuildRequires: unix2dos BuildRequires: xbean BuildRequires: xmvn-install -BuildRequires: xmvn-resolve xmvn-subst +BuildRequires: xmvn-resolve +BuildRequires: xmvn-subst BuildRequires: mvn(org.apache.maven:maven-parent:pom:) Requires: %{name}-lib = %{version}-%{release} Requires(post): aaa_base @@ -181,7 +181,7 @@ %setup -q -n apache-%{name}-%{version} -a10 %patch1 -p1 -%patch3 -p1 +%patch4 -p1 # not really used during build, but a precaution find -name '*.jar' -not -path '*/test/*' -delete @@ -367,7 +367,7 @@ %postun if [ $1 -eq 0 ]; then - update-alternatives --remove %{name} %{homedir}/bin/mvn + update-alternatives --remove mvn %{homedir}/bin/mvn fi %files lib -f .mfiles ++++++ 0002-Invoke-logback-via-reflection.patch ++++++ --- /var/tmp/diff_new_pack.WynF9I/_old 2019-11-26 16:55:58.732174848 +0100 +++ /var/tmp/diff_new_pack.WynF9I/_new 2019-11-26 16:55:58.732174848 +0100 @@ -1,17 +1,17 @@ -From 4e1e32e3a96c6876a22cca6743288b8c8df4adb0 Mon Sep 17 00:00:00 2001 +From 7610a10691e680db00edcbd4ce6767a30641cd71 Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Tue, 6 Jun 2017 13:47:43 +0200 -Subject: [PATCH 2/3] Invoke logback via reflection +Subject: [PATCH 2/4] Invoke logback via reflection --- .../logging/impl/LogbackConfiguration.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java -index 5d9fab7..ced38cb 100644 +index 5d9fab744..ced38cb5a 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java -@@ -35,22 +35,31 @@ public class LogbackConfiguration +@@ -35,22 +35,31 @@ @Override public void setRootLoggerLevel( Level level ) { @@ -49,5 +49,5 @@ @Override -- -2.17.1 +2.21.0 ++++++ 0004-Use-non-shaded-HTTP-wagon.patch ++++++ >From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <[email protected]> Date: Mon, 1 Jul 2019 09:51:56 +0200 Subject: [PATCH 4/4] Use non-shaded HTTP wagon --- apache-maven/pom.xml | 15 --------------- pom.xml | 1 - 2 files changed, 16 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 2686570af..d22ae121d 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -63,21 +63,6 @@ under the License. <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId> - <classifier>shaded</classifier> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-shared</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/pom.xml b/pom.xml index 237cdc39e..85436c54d 100644 --- a/pom.xml +++ b/pom.xml @@ -324,7 +324,6 @@ under the License. <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId> <version>${wagonVersion}</version> - <classifier>shaded</classifier> <exclusions> <exclusion> <groupId>commons-logging</groupId> -- 2.21.0 ++++++ apache-maven-3.5.4-src.tar.gz -> apache-maven-3.6.2-src.tar.gz ++++++ ++++ 16328 lines of diff (skipped)
