rpms/maven
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Restore compatibility with maven-polyglot

Browse Source
This commit is contained in:
Michael Simacek 2016-11-18 18:59:47 +01:00
parent da12f1942a
commit 4d12cc2a56
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Compatibility-with-polyglot.patch Normal file
View File

@ -0,0 +1,27 @@
From ed8b817b3a4c6367a51c2c5dbb969d1defdc3aa5 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Fri, 18 Nov 2016 18:56:25 +0100
Subject: [PATCH] Compatibility with polyglot
---
.../java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
index 0c720d1..76f733a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
@@ -86,7 +86,9 @@ public Model getSuperModel( final String version )
}
- superModel = modelProcessor.read( is, null );
+ Map<String, String> options = new HashMap<>();
+ options.put( "xml:4.0.0", "xml:4.0.0" );
+ superModel = modelProcessor.read( is, options );
superPoms.put( effectiveVersion, superModel );
}
--
2.7.4

8
maven.spec
View File

@ -3,7 +3,7 @@
Name: maven Name: maven
Version: 3.4.0 Version: 3.4.0
Release: 0.4.20161118git8ae1a3e%{?dist} Release: 0.5.20161118git8ae1a3e%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
License: ASL 2.0 License: ASL 2.0
URL: http://maven.apache.org/ URL: http://maven.apache.org/
@ -18,6 +18,8 @@ Source200: %{name}-script
Patch0: 0001-Force-SLF4J-SimpleLogger-re-initialization.patch Patch0: 0001-Force-SLF4J-SimpleLogger-re-initialization.patch
Patch1: 0002-Adapt-mvn-script.patch Patch1: 0002-Adapt-mvn-script.patch
Patch2: 0001-Use-exec-maven-plugin-instead-of-groovy-maven-plugin.patch Patch2: 0001-Use-exec-maven-plugin-instead-of-groovy-maven-plugin.patch
# TODO report upstream
Patch3: 0001-Compatibility-with-polyglot.patch
BuildRequires: maven-local BuildRequires: maven-local
@ -174,6 +176,7 @@ Summary: API documentation for %{name}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# not really used during build, but a precaution # not really used during build, but a precaution
rm -f maven-ant-tasks-*.jar rm -f maven-ant-tasks-*.jar
@ -302,6 +305,9 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog %changelog
* Fri Nov 18 2016 Michael Simacek <msimacek@redhat.com> - 3.4.0-0.5.20161118git8ae1a3e
- Restore compatibility with maven-polyglot
* Fri Nov 18 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-0.4.20161118git8ae1a3e * Fri Nov 18 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-0.4.20161118git8ae1a3e
- Versioned bundled(slf4j) provides - Versioned bundled(slf4j) provides