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 <fst...@suse.com>
+
+- 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");
++ loggerClass.getMethod("setLevel", new Class<?>[] {levelClass})
++ .invoke(logger, new Object[] {logbackLevel});
++ } catch (Exception e) {
++ throw new RuntimeException("Failed to initialize logback
configuration", e);
++ }
+ }
+
+ @Override
--
2.21.0
++++++ 0004-Use-non-shaded-HTTP-wagon.patch ++++++
--- /var/tmp/diff_new_pack.GPT3fO/_old 2020-02-18 10:38:51.136754370 +0100
+++ /var/tmp/diff_new_pack.GPT3fO/_new 2020-02-18 10:38:51.136754370 +0100
@@ -13,39 +13,39 @@
--- 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>
+ <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>
+ <!-- this is included in Wagon Http
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>
+@@ -328,7 +328,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.6.2-build.tar.xz -> apache-maven-3.6.3-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2019-11-22 06:32:14.066033055 +0100
+++ new/common.xml 2020-02-07 16:14:26.269282038 +0100
@@ -3,7 +3,7 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="3.6.2"/>
+ <property name="project.version" value="3.6.3"/>
<property name="project.groupId" value="org.apache.maven"/>
<property name="project.organization.name" value="The Apache Software
Foundation"/>
++++++ apache-maven-3.6.2-src.tar.gz -> apache-maven-3.6.3-src.tar.gz ++++++
++++ 385899 lines of diff (skipped)
