From c879d1e7f8da2043ffc844f5e8a6e33b24828851e4b06f0b4e3d6542fc74709f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 7 Feb 2020 15:52:23 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=14

---
 0002-Invoke-logback-via-reflection.patch | 72 ++++++++++++------------
 0004-Use-non-shaded-HTTP-wagon.patch     | 58 +++++++++----------
 apache-maven-3.6.2-build.tar.xz          |  3 -
 apache-maven-3.6.2-src.tar.gz            |  3 -
 apache-maven-3.6.3-build.tar.xz          |  3 +
 apache-maven-3.6.3-src.tar.gz            |  3 +
 maven.changes                            | 11 +++-
 maven.spec                               |  4 +-
 8 files changed, 83 insertions(+), 74 deletions(-)
 delete mode 100644 apache-maven-3.6.2-build.tar.xz
 delete mode 100644 apache-maven-3.6.2-src.tar.gz
 create mode 100644 apache-maven-3.6.3-build.tar.xz
 create mode 100644 apache-maven-3.6.3-src.tar.gz

diff --git a/0002-Invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch
index 0e1300a..2843df5 100644
--- a/0002-Invoke-logback-via-reflection.patch
+++ b/0002-Invoke-logback-via-reflection.patch
@@ -12,42 +12,42 @@ 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 @@
-     @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
 
diff --git a/0004-Use-non-shaded-HTTP-wagon.patch b/0004-Use-non-shaded-HTTP-wagon.patch
index 6d27b9c..9f66b3e 100644
--- a/0004-Use-non-shaded-HTTP-wagon.patch
+++ b/0004-Use-non-shaded-HTTP-wagon.patch
@@ -13,39 +13,39 @@ 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>
+     <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
 
diff --git a/apache-maven-3.6.2-build.tar.xz b/apache-maven-3.6.2-build.tar.xz
deleted file mode 100644
index b7eba84..0000000
--- a/apache-maven-3.6.2-build.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a79204f17594638af29abb2e1150b8a18dba065a7aed13b36e8b14974dfda4b
-size 5188
diff --git a/apache-maven-3.6.2-src.tar.gz b/apache-maven-3.6.2-src.tar.gz
deleted file mode 100644
index 7cb4570..0000000
--- a/apache-maven-3.6.2-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ed94655b4098729de292a13c96765bb90a407bb6feb64f201a9444aebde69d1
-size 2758845
diff --git a/apache-maven-3.6.3-build.tar.xz b/apache-maven-3.6.3-build.tar.xz
new file mode 100644
index 0000000..d45c906
--- /dev/null
+++ b/apache-maven-3.6.3-build.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f126061e5e8166700c6b63a367ac7e78a3b6b296334665c35a4e1e9706f31e4
+size 5188
diff --git a/apache-maven-3.6.3-src.tar.gz b/apache-maven-3.6.3-src.tar.gz
new file mode 100644
index 0000000..c14de93
--- /dev/null
+++ b/apache-maven-3.6.3-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07
+size 2762967
diff --git a/maven.changes b/maven.changes
index edc7db4..0ce0ef0 100644
--- a/maven.changes
+++ b/maven.changes
@@ -1,8 +1,17 @@
+-------------------------------------------------------------------
+Fri Feb  7 15:50:55 UTC 2020 - Fridrich Strba <fstrba@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
+
 -------------------------------------------------------------------
 Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
 - Upgrade to upstream version 3.6.2
-- Modified patche:
+- Modified patches:
   * 0002-Invoke-logback-via-reflection.patch
     + adapt to changed context
 - Removed patch:
diff --git a/maven.spec b/maven.spec
index ce04a25..1e6a8bc 100644
--- a/maven.spec
+++ b/maven.spec
@@ -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

From 0939fff4f73a77527ed6d53b2177fefef5d695e0dbe1bd69194dde33e23b9423 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 17 Feb 2020 09:21:43 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=15

---
 maven.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven.changes b/maven.changes
index 0ce0ef0..0d3520b 100644
--- a/maven.changes
+++ b/maven.changes
@@ -11,7 +11,7 @@ Fri Feb  7 15:50:55 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
 - Upgrade to upstream version 3.6.2
-- Modified patches:
+- Modified patch:
   * 0002-Invoke-logback-via-reflection.patch
     + adapt to changed context
 - Removed patch: