Update to upstream version 2.4.0
This commit is contained in:
Mikolaj Izdebski
parent
65b26a5ea6
commit
2007ec15f6
1
.gitignore
vendored
1
.gitignore
vendored
@ -39,3 +39,4 @@
|
||||
/xmvn-2.3.0.tar.xz
|
||||
/xmvn-2.3.1.tar.xz
|
||||
/xmvn-2.3.2.tar.xz
|
||||
/xmvn-2.4.0.tar.xz
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From c9884f33ea7f09fd7e2dbd8c0d35835ae0bfb463 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Wed, 25 Mar 2015 10:23:13 +0100
|
||||
Subject: [PATCH 1/2] Port to Gradle 2.4-rc-1
|
||||
|
||||
---
|
||||
.../xmvn/connector/gradle/GradleResolver.java | 15 +++++++++------
|
||||
xmvn-parent/pom.xml | 2 +-
|
||||
2 files changed, 10 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
|
||||
index af4d068..a5d655f 100644
|
||||
--- a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
|
||||
+++ b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
|
||||
@@ -36,6 +36,8 @@ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRe
|
||||
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
|
||||
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.GradlePomModuleDescriptorParser;
|
||||
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
|
||||
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionComparator;
|
||||
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionSelectorScheme;
|
||||
import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
|
||||
import org.gradle.api.internal.component.ArtifactType;
|
||||
import org.gradle.internal.component.external.model.DefaultMavenModuleResolveMetaData;
|
||||
@@ -54,10 +56,10 @@ import org.gradle.internal.resolve.ModuleVersionResolveException;
|
||||
import org.gradle.internal.resolve.result.BuildableArtifactResolveResult;
|
||||
import org.gradle.internal.resolve.result.BuildableArtifactSetResolveResult;
|
||||
import org.gradle.internal.resolve.result.BuildableModuleComponentMetaDataResolveResult;
|
||||
-import org.gradle.internal.resolve.result.BuildableModuleComponentVersionSelectionResolveResult;
|
||||
-import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource;
|
||||
-import org.gradle.internal.resource.LocallyAvailableExternalResource;
|
||||
+import org.gradle.internal.resolve.result.BuildableModuleVersionListingResolveResult;
|
||||
+import org.gradle.internal.resource.local.DefaultLocallyAvailableExternalResource;
|
||||
import org.gradle.internal.resource.local.DefaultLocallyAvailableResource;
|
||||
+import org.gradle.internal.resource.local.LocallyAvailableExternalResource;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.w3c.dom.Document;
|
||||
@@ -159,7 +161,7 @@ public class GradleResolver
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void listModuleVersions( DependencyMetaData arg0, BuildableModuleComponentVersionSelectionResolveResult arg1 )
|
||||
+ public void listModuleVersions( DependencyMetaData arg0, BuildableModuleVersionListingResolveResult arg1 )
|
||||
{
|
||||
logger.debug( "listModuleVersions() called, but it is NOT IMPLEMENTED" );
|
||||
}
|
||||
@@ -207,8 +209,9 @@ public class GradleResolver
|
||||
Path fakePom = fakePom( pomPath, id );
|
||||
logger.debug( "Created fake POM: {}", fakePom );
|
||||
|
||||
- MetaDataParser parser = new GradlePomModuleDescriptorParser();
|
||||
- MutableModuleComponentResolveMetaData metaData = parser.parseMetaData( this, fakePom.toFile() );
|
||||
+ MetaDataParser<DefaultMavenModuleResolveMetaData> parser =
|
||||
+ new GradlePomModuleDescriptorParser( new DefaultVersionSelectorScheme( new DefaultVersionComparator() ) );
|
||||
+ MutableModuleComponentResolveMetaData metaData = parser.parseMetaData( this, pomPath.toFile() );
|
||||
|
||||
result.resolved( metaData );
|
||||
return;
|
||||
diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
|
||||
index 041215a..a9f055e 100644
|
||||
--- a/xmvn-parent/pom.xml
|
||||
+++ b/xmvn-parent/pom.xml
|
||||
@@ -79,7 +79,7 @@
|
||||
<atinjectVersion>1</atinjectVersion>
|
||||
<ivyVersion>2.4.0</ivyVersion>
|
||||
<jcommanderVersion>1.47</jcommanderVersion>
|
||||
- <gradleVersion>2.2.1</gradleVersion>
|
||||
+ <gradleVersion>2.4-rc-1</gradleVersion>
|
||||
<guiceVersion>3.2.5</guiceVersion>
|
||||
<guavaVersion>18.0</guavaVersion>
|
||||
<mavenInvokerVersion>2.1.1</mavenInvokerVersion>
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 7b3a4ec319073d106ccaf7f29cf7aff4b0d62802 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Thu, 16 Apr 2015 10:18:25 +0200
|
||||
Subject: [PATCH 2/2] Disable doclint in javadoc:aggregate MOJO executions
|
||||
|
||||
---
|
||||
.../xmvn/connector/aether/XMvnMojoExecutionListener.java | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java b/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java
|
||||
index 8e3f3f8..7265d36 100644
|
||||
--- a/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java
|
||||
+++ b/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java
|
||||
@@ -33,6 +33,8 @@ import org.apache.maven.plugin.Mojo;
|
||||
import org.apache.maven.plugin.MojoExecution;
|
||||
import org.apache.maven.plugin.MojoExecutionException;
|
||||
import org.apache.maven.project.MavenProject;
|
||||
+import org.eclipse.sisu.bean.BeanProperties;
|
||||
+import org.eclipse.sisu.bean.BeanProperty;
|
||||
|
||||
/**
|
||||
* Listens to various MOJO executions and captures useful information.
|
||||
@@ -191,7 +193,18 @@ public class XMvnMojoExecutionListener
|
||||
@Override
|
||||
public void beforeMojoExecution( MojoExecutionEvent event )
|
||||
{
|
||||
- // Nothing to do
|
||||
+ Mojo mojo = event.getMojo();
|
||||
+ MojoExecution execution = event.getExecution();
|
||||
+
|
||||
+ // Disable doclint
|
||||
+ if ( JAVADOC_AGGREGATE.equals( execution ) )
|
||||
+ {
|
||||
+ for ( BeanProperty<Object> property : new BeanProperties( mojo.getClass() ) )
|
||||
+ {
|
||||
+ if ( property.getName().equals( "additionalparam" ) )
|
||||
+ property.set( mojo, "-Xdoclint:none" );
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
@Override
|
||||
--
|
||||
2.1.0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
d9a254a74f5754e77d591bdf0b405865 xmvn-2.3.2.tar.xz
|
||||
1d6019275df79df57ef7e676ebf4fa19 xmvn-2.4.0.tar.xz
|
||||
|
||||
12
xmvn.spec
12
xmvn.spec
@ -3,8 +3,8 @@
|
||||
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^osgi\\($
|
||||
|
||||
Name: xmvn
|
||||
Version: 2.3.2
|
||||
Release: 8%{?dist}
|
||||
Version: 2.4.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Local Extensions for Apache Maven
|
||||
License: ASL 2.0
|
||||
URL: http://mizdebsk.fedorapeople.org/xmvn
|
||||
@ -12,9 +12,6 @@ BuildArch: noarch
|
||||
|
||||
Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
|
||||
|
||||
Patch0: 0001-Port-to-Gradle-2.4-rc-1.patch
|
||||
Patch1: 0002-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch
|
||||
|
||||
BuildRequires: maven >= 3.3
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: beust-jcommander
|
||||
@ -153,8 +150,6 @@ This package provides %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%mvn_package :xmvn __noinstall
|
||||
|
||||
@ -300,6 +295,9 @@ cp -P %{_datadir}/maven/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Wed May 6 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-1
|
||||
- Update to upstream version 2.4.0
|
||||
|
||||
* Fri Apr 24 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.2-8
|
||||
- Port to Gradle 2.4-rc-1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user