From 082d69432d04bd0cff1f2042b15e0fbf5135002a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 26 2017 09:17:22 +0000 Subject: import rh-maven33-xmvn-2.1.1-1.22.el7 --- diff --git a/SOURCES/0001-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch b/SOURCES/0001-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch index 19b0817..20c69b5 100644 --- a/SOURCES/0001-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch +++ b/SOURCES/0001-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch @@ -1,7 +1,7 @@ From b9dc38741887a8daea1f894741c2070c58901752 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 16 Apr 2015 10:18:25 +0200 -Subject: [PATCH 1/4] Disable doclint in javadoc:aggregate MOJO executions +Subject: [PATCH 1/5] Disable doclint in javadoc:aggregate MOJO executions Java 8 detection code assumes that toolchains are not in use -- the same JDK version is used to run XMvn and generate javadocs. @@ -69,5 +69,5 @@ index a9cac0e..e6b3e36 100644 @Override -- -2.5.0 +2.7.4 diff --git a/SOURCES/0002-Add-duplicated-ZIP-entry-hack-for-OpenJDK.patch b/SOURCES/0002-Add-duplicated-ZIP-entry-hack-for-OpenJDK.patch index a59404a..07d9364 100644 --- a/SOURCES/0002-Add-duplicated-ZIP-entry-hack-for-OpenJDK.patch +++ b/SOURCES/0002-Add-duplicated-ZIP-entry-hack-for-OpenJDK.patch @@ -1,7 +1,7 @@ From df720cdeb86e671ac336d337dfedda1cf2d1f711 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 28 Oct 2015 13:08:23 +0100 -Subject: [PATCH 2/4] Add duplicated ZIP entry hack for OpenJDK +Subject: [PATCH 2/5] Add duplicated ZIP entry hack for OpenJDK --- .../xmvn/tools/install/impl/JarUtils.java | 29 ++++++++++++++++++++++ @@ -71,5 +71,5 @@ index 5dd09ea..ae2a5a6 100644 int sz; -- -2.5.0 +2.7.4 diff --git a/SOURCES/0003-Add-hack-for-forcing-correct-namespace-in-depmap-res.patch b/SOURCES/0003-Add-hack-for-forcing-correct-namespace-in-depmap-res.patch index a9cfde0..1376926 100644 --- a/SOURCES/0003-Add-hack-for-forcing-correct-namespace-in-depmap-res.patch +++ b/SOURCES/0003-Add-hack-for-forcing-correct-namespace-in-depmap-res.patch @@ -1,7 +1,7 @@ From de97042bc5c3eaea30f6f63958e422a05b0290b0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 17 Dec 2014 23:31:35 +0100 -Subject: [PATCH 3/4] Add hack for forcing correct namespace in depmap resolver +Subject: [PATCH 3/5] Add hack for forcing correct namespace in depmap resolver --- .../fedoraproject/xmvn/resolver/impl/depmap/DepmapBasedResolver.java | 5 +++++ @@ -24,5 +24,5 @@ index 298b060..8ad228d 100644 } } -- -2.5.0 +2.7.4 diff --git a/SOURCES/0004-Port-to-Modello-1.7.patch b/SOURCES/0004-Port-to-Modello-1.7.patch index 2bab6e4..6336cdf 100644 --- a/SOURCES/0004-Port-to-Modello-1.7.patch +++ b/SOURCES/0004-Port-to-Modello-1.7.patch @@ -1,7 +1,7 @@ From 06cbffad8f5609188a788e85991918078d9fca12 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 7 Jan 2015 10:21:15 +0100 -Subject: [PATCH 4/4] Port to Modello 1.7 +Subject: [PATCH 4/5] Port to Modello 1.7 --- xmvn-core/pom.xml | 2 - @@ -8119,5 +8119,5 @@ index 5f7544b..9ed9ff0 100644 2.7 2.7 -- -2.5.0 +2.7.4 diff --git a/SOURCES/0005-Revert-Always-use-default-Ivy-settings.patch b/SOURCES/0005-Revert-Always-use-default-Ivy-settings.patch new file mode 100644 index 0000000..b16745a --- /dev/null +++ b/SOURCES/0005-Revert-Always-use-default-Ivy-settings.patch @@ -0,0 +1,62 @@ +From e08188c2acef96aa4cbffdaa3dc1aeea8fc1e0ca Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 11 Oct 2016 09:10:36 +0200 +Subject: [PATCH 5/5] Revert "Always use default Ivy settings" + +This reverts commit 794f69a86efbaec6eff718376d853e8788046f07. +--- + .../java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/xmvn-connector-ivy/src/main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java b/xmvn-connector-ivy/src/main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java +index fc222bc..f9c50e1 100644 +--- a/xmvn-connector-ivy/src/main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java ++++ b/xmvn-connector-ivy/src/main/java/org/fedoraproject/xmvn/connector/ivy/IvyResolver.java +@@ -43,7 +43,6 @@ import org.apache.ivy.core.report.MetadataArtifactDownloadReport; + import org.apache.ivy.core.resolve.DownloadOptions; + import org.apache.ivy.core.resolve.ResolveData; + import org.apache.ivy.core.resolve.ResolvedModuleRevision; +-import org.apache.ivy.core.settings.IvySettings; + import org.apache.ivy.plugins.parser.ModuleDescriptorParser; + import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser; + import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorWriter; +@@ -100,8 +99,6 @@ public class IvyResolver + static final Deployer deployer = LazyLocatorProvider.locator.getService( Deployer.class ); + } + +- private final IvySettings settings = new IvySettings(); +- + private Resolver resolver; + + private Deployer deployer; +@@ -242,7 +239,7 @@ public class IvyResolver + if ( pomPath != null ) + { + ModuleDescriptorParser parser = PomModuleDescriptorParser.getInstance(); +- module = parser.parseDescriptor( settings, pomPath.toFile().toURI().toURL(), false ); ++ module = parser.parseDescriptor( getSettings(), pomPath.toFile().toURI().toURL(), false ); + version = resolvedVersion( result ); + } + else +@@ -303,7 +300,7 @@ public class IvyResolver + { + File ivyPath = Files.createTempFile( "xmvn-", ".ivy.xml" ).toFile(); + ModuleDescriptorParser parser = PomModuleDescriptorParser.getInstance(); +- ModuleDescriptor module = parser.parseDescriptor( settings, pomPath.toFile().toURI().toURL(), false ); ++ ModuleDescriptor module = parser.parseDescriptor( getSettings(), pomPath.toFile().toURI().toURL(), false ); + XmlModuleDescriptorWriter.write( module, ivyPath ); + } + catch ( IOException | ParseException e ) +@@ -364,7 +361,8 @@ public class IvyResolver + { + File pomFile = Files.createTempFile( "xmvn-", ".pom" ).toFile(); + ModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance(); +- ModuleDescriptor module = parser.parseDescriptor( settings, artifactPath.toFile().toURI().toURL(), false ); ++ ModuleDescriptor module = ++ parser.parseDescriptor( getSettings(), artifactPath.toFile().toURI().toURL(), false ); + PomModuleDescriptorWriter.write( module, pomFile, new PomWriterOptions() ); + + org.fedoraproject.xmvn.artifact.Artifact artifact = ivy2aether( moduleRevisionId, "pom" ); +-- +2.7.4 + diff --git a/SPECS/xmvn.spec b/SPECS/xmvn.spec index 390aaa4..7108080 100644 --- a/SPECS/xmvn.spec +++ b/SPECS/xmvn.spec @@ -4,7 +4,7 @@ Name: %{?scl_prefix}%{pkg_name} Version: 2.1.1 -Release: 1.19%{?dist} +Release: 1.22%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -17,6 +17,7 @@ Patch0001: 0001-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch Patch0002: 0002-Add-duplicated-ZIP-entry-hack-for-OpenJDK.patch Patch0003: 0003-Add-hack-for-forcing-correct-namespace-in-depmap-res.patch Patch0004: 0004-Port-to-Modello-1.7.patch +Patch0005: 0005-Revert-Always-use-default-Ivy-settings.patch BuildRequires: %{?scl_prefix}maven BuildRequires: %{?scl_prefix}maven-local @@ -153,6 +154,7 @@ set -e -x %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 +%patch0005 -p1 # XXX Disable duplicate metadata enforcing for now sed -i /artifactMap.remove/d $(find -name MetadataResolver.java) @@ -215,6 +217,9 @@ cp -r %{_datadir}/maven/lib/* %{buildroot}%{_datadir}/%{pkg_name}/lib/ # possibly recreate symlinks that can be automated with xmvn-subst %{pkg_name}-subst %{buildroot}%{_datadir}/%{pkg_name}/ +for jar in `find %{buildroot}%{_datadir}/%{pkg_name}/lib -type f -name 'xmvn-*.jar'`; do + ln -sf "%{_javadir}/%{pkg_name}/`basename $jar | sed 's/-%{version}//'`" $jar +done # /usr/bin/xmvn script echo "#!/bin/sh -e @@ -298,6 +303,15 @@ cp -P %{_datadir}/maven/bin/m2.conf %{buildroot}%{_datadir}/%{pkg_name}/bin/ %doc LICENSE NOTICE %changelog +* Mon Jan 16 2017 Michael Simacek - 2.1.1-1.22 +- Fix basename invocation on RHEL 6 + +* Mon Jan 16 2017 Michael Simacek - 2.1.1-1.21 +- Fix symlink generation + +* Tue Oct 11 2016 Mikolaj Izdebski - 2.1.1-1.20 +- Resolves: rhbz#1383583 + * Mon Feb 08 2016 Michal Srb - 2.1.1-1.19 - Fix BR on maven-local & co.