pool/maven
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=14

Browse Source
This commit is contained in:
Fridrich Strba 2020-02-07 15:52:23 +00:00 committed by Git OBS Bridge
parent 0ad2c2b8a0
commit c879d1e7f8
8 changed files with 83 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
0002-Invoke-logback-via-reflection.patch
View File

@ -12,42 +12,42 @@ index 5d9fab744..ced38cb5a 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java --- 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 +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
@@ -35,22 +35,31 @@ @@ -35,22 +35,31 @@
@Override @Override
public void setRootLoggerLevel( Level level ) public void setRootLoggerLevel( Level level )
{ {
- ch.qos.logback.classic.Level value; - ch.qos.logback.classic.Level value;
+ String value; + String value;
switch ( level ) switch ( level )
{ {
case DEBUG: case DEBUG:
- value = ch.qos.logback.classic.Level.DEBUG; - value = ch.qos.logback.classic.Level.DEBUG;
+ value = "DEBUG"; + value = "DEBUG";
break; break;
case INFO: case INFO:
- value = ch.qos.logback.classic.Level.INFO; - value = ch.qos.logback.classic.Level.INFO;
+ value = "INFO"; + value = "INFO";
break; break;
default: default:
- value = ch.qos.logback.classic.Level.ERROR; - value = ch.qos.logback.classic.Level.ERROR;
+ value = "ERROR"; + value = "ERROR";
break; break;
} }
- ( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ) ).setLevel( value ); - ( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
+ Logger logger = LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ); + Logger logger = LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME );
+ try { + try {
+ Class<?> levelClass = Class.forName("ch.qos.logback.classic.Level"); + Class<?> levelClass = Class.forName("ch.qos.logback.classic.Level");
+ Object logbackLevel = levelClass.getField(value).get(null); + Object logbackLevel = levelClass.getField(value).get(null);
+ Class<?> loggerClass = Class.forName("ch.qos.logback.classic.Logger"); + Class<?> loggerClass = Class.forName("ch.qos.logback.classic.Logger");
+ loggerClass.getMethod("setLevel", new Class<?>[] {levelClass}) + loggerClass.getMethod("setLevel", new Class<?>[] {levelClass})
+ .invoke(logger, new Object[] {logbackLevel}); + .invoke(logger, new Object[] {logbackLevel});
+ } catch (Exception e) { + } catch (Exception e) {
+ throw new RuntimeException("Failed to initialize logback configuration", e); + throw new RuntimeException("Failed to initialize logback configuration", e);
+ } + }
} }
@Override @Override
-- --
2.21.0 2.21.0

58
0004-Use-non-shaded-HTTP-wagon.patch
View File

@ -13,39 +13,39 @@ index 2686570af..d22ae121d 100644
--- a/apache-maven/pom.xml --- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml +++ b/apache-maven/pom.xml
@@ -63,21 +63,6 @@ under the License. @@ -63,21 +63,6 @@ under the License.
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId> <artifactId>wagon-http</artifactId>
- <classifier>shaded</classifier> - <classifier>shaded</classifier>
- <exclusions> - <exclusions>
- <exclusion> - <exclusion>
- <groupId>org.apache.httpcomponents</groupId> - <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId> - <artifactId>httpclient</artifactId>
- </exclusion> - </exclusion>
- <exclusion> - <exclusion>
- <groupId>org.apache.httpcomponents</groupId> - <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId> - <artifactId>httpcore</artifactId>
- </exclusion> - </exclusion>
- <exclusion> - <exclusion>
- <groupId>org.apache.maven.wagon</groupId> - <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-shared</artifactId> - <artifactId>wagon-http-shared</artifactId>
- </exclusion> - </exclusion>
- </exclusions> - </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <!-- this is included in Wagon Http
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 237cdc39e..85436c54d 100644 index 237cdc39e..85436c54d 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -324,7 +324,6 @@ under the License. @@ -328,7 +328,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId> <artifactId>wagon-http</artifactId>
<version>${wagonVersion}</version> <version>${wagonVersion}</version>
- <classifier>shaded</classifier> - <classifier>shaded</classifier>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
-- --
2.21.0 2.21.0

3
apache-maven-3.6.2-build.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a79204f17594638af29abb2e1150b8a18dba065a7aed13b36e8b14974dfda4b
size 5188

3
apache-maven-3.6.2-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ed94655b4098729de292a13c96765bb90a407bb6feb64f201a9444aebde69d1
size 2758845

3
apache-maven-3.6.3-build.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f126061e5e8166700c6b63a367ac7e78a3b6b296334665c35a4e1e9706f31e4
size 5188

3
apache-maven-3.6.3-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07
size 2762967

11
maven.changes
View File

@ -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> Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 3.6.2 - Upgrade to upstream version 3.6.2
- Modified patche: - Modified patches:
* 0002-Invoke-logback-via-reflection.patch * 0002-Invoke-logback-via-reflection.patch
+ adapt to changed context + adapt to changed context
- Removed patch: - Removed patch:

4
maven.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package maven # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@
%global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix} %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
%bcond_with logback %bcond_with logback
Name: maven Name: maven
Version: 3.6.2 Version: 3.6.3
Release: 0 Release: 0
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0 # maven itself is ASL 2.0