[maven-doxia-tools] Update to upstream version 1.6
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Sun Jul 20 09:18:10 UTC 2014
commit e083eea2c22091cd26873ae3813c51e24fb73883
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Sun Jul 20 10:47:21 2014 +0200
Update to upstream version 1.6
.gitignore | 1 +
0001-Port-to-Maven-3-APIs.patch | 122 +++++++++++++++++----------------------
maven-doxia-tools.spec | 17 ++++--
sources | 2 +-
4 files changed, 67 insertions(+), 75 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c6d2c9e..120db2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-doxia-tools-1.2.tbz
maven-doxia-tools-1.4-source-release.zip
+/doxia-integration-tools-1.6-source-release.zip
diff --git a/0001-Port-to-Maven-3-APIs.patch b/0001-Port-to-Maven-3-APIs.patch
index 53605cc..c3ab726 100644
--- a/0001-Port-to-Maven-3-APIs.patch
+++ b/0001-Port-to-Maven-3-APIs.patch
@@ -1,80 +1,66 @@
-From ac98812d7b558e66c728e02a4b169e165c28d080 Mon Sep 17 00:00:00 2001
+From a9c78b4e8321139d4177119468955984f97fe0ba Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 17 Jan 2014 17:09:07 +0100
Subject: [PATCH] Port to Maven 3 APIs
---
- pom.xml | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
+ pom.xml | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 00f25e1..9f12070 100644
+index d4d994d..d9888de 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -37,7 +37,7 @@
- <description>A collection of tools to help the integration of Doxia in Maven plugins.</description>
-
- <prerequisites>
-- <maven>2.2.1</maven>
-+ <maven>${mavenVersion}</maven>
- </prerequisites>
-
- <scm>
+@@ -36,7 +36,7 @@
+ <description>A collection of tools to help the integration of Doxia in Maven plugins.</description>
+
+ <prerequisites>
+- <maven>2.2.1</maven>
++ <maven>${mavenVersion}</maven>
+ </prerequisites>
+
+ <scm>
@@ -58,7 +58,7 @@
- <properties>
- <doxiaVersion>1.2</doxiaVersion>
- <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
-- <mavenVersion>2.2.1</mavenVersion>
-+ <mavenVersion>3.1.1</mavenVersion>
- </properties>
-
- <dependencies>
-@@ -75,24 +75,24 @@
- </dependency>
-
- <!-- maven -->
-- <dependency>
-+ <dependency>
- <groupId>org.apache.maven</groupId>
-- <artifactId>maven-artifact</artifactId>
-+ <artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
-- <dependency>
-+ <dependency>
- <groupId>org.apache.maven</groupId>
-- <artifactId>maven-artifact-manager</artifactId>
-+ <artifactId>maven-compat</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
-- <artifactId>maven-model</artifactId>
-+ <artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
-- <artifactId>maven-project</artifactId>
-+ <artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
-@@ -174,12 +174,12 @@
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
-- <artifactId>plexus-maven-plugin</artifactId>
-+ <artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <id>create-component-descriptor</id>
- <goals>
-- <goal>descriptor</goal>
-+ <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
+ <properties>
+ <doxiaVersion>1.6</doxiaVersion>
+ <doxiaSitetoolsVersion>1.6</doxiaSitetoolsVersion>
+- <mavenVersion>2.2.1</mavenVersion>
++ <mavenVersion>3.1.1</mavenVersion>
+ </properties>
+
+ <dependencies>
+@@ -75,25 +75,25 @@
+ </dependency>
+
+ <!-- maven -->
+- <dependency>
++ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-artifact</artifactId>
++ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+- <dependency>
++ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-artifact-manager</artifactId>
++ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-model</artifactId>
++ <artifactId>maven-artifact</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
++ <artifactId>maven-model</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
--
-1.8.4.2
+1.9.3
diff --git a/maven-doxia-tools.spec b/maven-doxia-tools.spec
index 1a7927e..cda1f49 100644
--- a/maven-doxia-tools.spec
+++ b/maven-doxia-tools.spec
@@ -1,12 +1,12 @@
Name: maven-doxia-tools
-Version: 1.4
-Release: 16%{?dist}
+Version: 1.6
+Release: 1%{?dist}
Summary: Maven Doxia Integration Tools
License: ASL 2.0
-URL: http://maven.apache.org/shared/maven-doxia-tools/
+URL: http://maven.apache.org/doxia/doxia-tools/
BuildArch: noarch
-Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0: http://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-integration-tools/%{version}/doxia-integration-tools-%{version}-source-release.zip
Patch0: 0001-Port-to-Maven-3-APIs.patch
@@ -18,9 +18,10 @@ BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-compat)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
+BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
-BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-i18n)
@@ -37,9 +38,10 @@ Summary: API documentation for %{name}
This package contains %{summary}.
%prep
-%setup -q
+%setup -q -n doxia-integration-tools-%{version}
%patch0 -p1 -b .sav
%pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"
+%pom_set_parent org.apache.maven:maven-parent:24
%mvn_file : %{name}
%mvn_alias : org.apache.maven.doxia:doxia-integration-tools
@@ -57,6 +59,9 @@ This package contains %{summary}.
%doc LICENSE NOTICE
%changelog
+* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.6-1
+- Update to upstream version 1.6
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 96f67d2..3f22627 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a588119a2815f64e75d4edd7bb60b79c maven-doxia-tools-1.4-source-release.zip
+5a05f1e0f142aef6090dd2711cc4a558 doxia-integration-tools-1.6-source-release.zip
More information about the scm-commits
mailing list