commit maven for openSUSE:Factory
Hello community,
here is the log from the commit of package maven for openSUSE:Factory checked
in at 2020-03-17 13:09:58
Comparing /work/SRC/openSUSE:Factory/maven (Old)
and /work/SRC/openSUSE:Factory/.maven.new.3160 (New)
Package is "maven"
Tue Mar 17 13:09:58 2020 rev:4 rq:785656 version:3.6.3
Changes:
--- /work/SRC/openSUSE:Factory/maven/maven.changes 2020-02-18
10:38:48.624749244 +0100
+++ /work/SRC/openSUSE:Factory/.maven.new.3160/maven.changes2020-03-17
13:10:02.829794443 +0100
@@ -1,0 +2,5 @@
+Sun Mar 1 08:27:38 UTC 2020 - Fridrich Strba
+
+- Let maven-lib obsolete maven-jansi
+
+---
Other differences:
--
++ maven.spec ++
--- /var/tmp/diff_new_pack.6VdeNZ/_old 2020-03-17 13:10:03.761795159 +0100
+++ /var/tmp/diff_new_pack.6VdeNZ/_new 2020-03-17 13:10:03.765795163 +0100
@@ -28,7 +28,7 @@
# bundled slf4j is MIT
License:Apache-2.0 AND MIT
Group: Development/Tools/Building
-URL:http://maven.apache.org/
+URL:https://maven.apache.org/
Source0:
http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz
Source1:maven-bash-completion
Source2:mvn.1
@@ -162,6 +162,10 @@
# patch (using a script written in Groovy), compile and package as
# maven-slf4j-provider.jar, together with Maven-specific additions.
Provides: bundled(slf4j) = %{bundled_slf4j_version}
+# This package might be installed on a system, since it used to be
+# produced by the binary maven repackaging in some repositories.
+# This Obsoletes will allow a clean upgrade.
+Obsoletes: %{name}-jansi
# If XMvn is part of the same RPM transaction then it should be
# installed first to avoid triggering rhbz#1014355.
OrderWithRequires: xmvn-minimal
@@ -255,7 +259,7 @@
slf4j/simple \
xbean/xbean-reflect
ln -s $(build-classpath slf4j/slf4j-simple-sources) lib/
-%ant \
+%{ant} \
-Dtest.skip=true \
package javadoc
commit maven for openSUSE:Factory
Hello community,
here is the log from the commit of package maven for openSUSE:Factory checked
in at 2020-02-18 10:37:50
Comparing /work/SRC/openSUSE:Factory/maven (Old)
and /work/SRC/openSUSE:Factory/.maven.new.26092 (New)
Package is "maven"
Tue Feb 18 10:37:50 2020 rev:3 rq:774808 version:3.6.3
Changes:
--- /work/SRC/openSUSE:Factory/maven/maven.changes 2019-11-26
16:55:55.416175943 +0100
+++ /work/SRC/openSUSE:Factory/.maven.new.26092/maven.changes 2020-02-18
10:38:48.624749244 +0100
@@ -1,0 +2,9 @@
+Fri Feb 7 15:50:55 UTC 2020 - Fridrich Strba
+
+- Upgrade to upstream version 3.6.3
+- Modified patches:
+ * 0002-Invoke-logback-via-reflection.patch
+ * 0004-Use-non-shaded-HTTP-wagon.patch
++ Adapt to changed line endings
+
+---
@@ -5 +14 @@
-- Modified patche:
+- Modified patch:
Old:
apache-maven-3.6.2-build.tar.xz
apache-maven-3.6.2-src.tar.gz
New:
apache-maven-3.6.3-build.tar.xz
apache-maven-3.6.3-src.tar.gz
Other differences:
--
++ maven.spec ++
--- /var/tmp/diff_new_pack.GPT3fO/_old 2020-02-18 10:38:51.080754255 +0100
+++ /var/tmp/diff_new_pack.GPT3fO/_new 2020-02-18 10:38:51.088754272 +0100
@@ -1,7 +1,7 @@
#
# spec file for package maven
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 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.6.2
+Version:3.6.3
Release:0
Summary:Java project management and project comprehension tool
# maven itself is ASL 2.0
++ 0002-Invoke-logback-via-reflection.patch ++
--- /var/tmp/diff_new_pack.GPT3fO/_old 2020-02-18 10:38:51.120754337 +0100
+++ /var/tmp/diff_new_pack.GPT3fO/_new 2020-02-18 10:38:51.120754337 +0100
@@ -12,42 +12,42 @@
---
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 @@
- @Override
- public void setRootLoggerLevel( Level level )
- {
--ch.qos.logback.classic.Level value;
-+String value;
- switch ( level )
- {
- case DEBUG:
--value = ch.qos.logback.classic.Level.DEBUG;
-+value = "DEBUG";
- break;
-
- case INFO:
--value = ch.qos.logback.classic.Level.INFO;
-+value = "INFO";
- break;
-
- default:
--value = ch.qos.logback.classic.Level.ERROR;
-+value = "ERROR";
- break;
- }
--( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(
Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
-+Logger logger = LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME );
-+try {
-+Class levelClass =
Class.forName("ch.qos.logback.classic.Level");
-+Object logbackLevel = levelClass.getField(value).get(null);
-+Class loggerClass =
Class.forName("ch.qos.logback.classic.Logger");
-+loggerClass.getMethod("setLevel", new Class[] {levelClass})
-+.invoke(logger, new Object[] {logbackLevel});
-+} catch (Exception e) {
-+throw new RuntimeException("Failed to initialize logback
configuration", e);
-+}
- }
-
- @Override
+ @Override
+ public void setRootLoggerLevel( Level level )
+ {
+-ch.qos.logback.classic.Level value;
++String value;
+ switch ( level )
+ {
+ case DEBUG:
+-value = ch.qos.logback.classic.Level.DEBUG;
++value = "DEBUG";
+ break;
+
+ case INFO:
+-value = ch.qos.logback.classic.Level.INFO;
++value = "INFO";
+ break;
+
+ default:
+-value = ch.qos.logback.classic.Level.ERROR;
++value = "ERROR";
+ break;
+ }
+-( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(
Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
++Logger logger = LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME );
++try {
++Class levelClass =
Class.forName("ch.qos.logback.classic.Level");
++Object logbackLevel = levelClass.getField(value).get(null);
++Class loggerClass =
Class.forName("ch.qos.logback.classic.Logger");
++
commit maven for openSUSE:Factory
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
+
+- 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
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
