mizdebsk pushed to maven-docck-plugin (master). "Update to upstream version 1.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 10 08:00:04 UTC 2015


>From dcf42c093e9a866671b63398d91cacbdeafc5722 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 10 Apr 2015 09:58:56 +0200
Subject: Update to upstream version 1.1


diff --git a/.gitignore b/.gitignore
index 768690b..744a87c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-docck-plugin-1.0.tar.bz2
+/maven-docck-plugin-1.1-source-release.zip
diff --git a/0001-Port-to-maven-plugin-tools-3.4.patch b/0001-Port-to-maven-plugin-tools-3.4.patch
new file mode 100644
index 0000000..8621fbe
--- /dev/null
+++ b/0001-Port-to-maven-plugin-tools-3.4.patch
@@ -0,0 +1,25 @@
+From 934ebb418691238a56647eaa4d1786dc2b342821 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Fri, 10 Apr 2015 09:54:33 +0200
+Subject: [PATCH] Port to maven-plugin-tools 3.4
+
+---
+ .../org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java b/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
+index b9b5541..e42ab8c 100644
+--- a/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
++++ b/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
+@@ -65,7 +65,7 @@ public class CheckPluginDocumentationMojo
+ 
+         try
+         {
+-            mojoScanner.populatePluginDescriptor( project, descriptor );
++            mojoScanner.populatePluginDescriptor( new org.apache.maven.tools.plugin.DefaultPluginToolsRequest( project, descriptor ) );
+         }
+         catch ( InvalidPluginDescriptorException e )
+         {
+-- 
+2.1.0
+
diff --git a/maven-docck-plugin.spec b/maven-docck-plugin.spec
index 17b499a..fb3f6c8 100644
--- a/maven-docck-plugin.spec
+++ b/maven-docck-plugin.spec
@@ -1,24 +1,28 @@
 Name:           maven-docck-plugin
-Version:        1.0
-Release:        16%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Maven Documentation Checker Plugin
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-docck-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-docck-plugin-1.0/
-#tar jcf maven-docck-plugin-1.0.tar.bz2 maven-docck-plugin-1.0/
-Source0:        %{name}-%{version}.tar.bz2
-BuildArch: noarch
+BuildArch:      noarch
+
+Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
+
+Patch0:         0001-Port-to-maven-plugin-tools-3.4.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-httpclient:commons-httpclient)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins)
-BuildRequires:  mvn(org.apache.maven.shared:file-management)
+BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-descriptor)
 BuildRequires:  mvn(org.apache.maven:maven-project)
 BuildRequires:  mvn(org.apache.maven:maven-settings)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-beanshell)
+BuildRequires:  mvn(org.apache.maven.shared:file-management)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 
 %description
@@ -31,7 +35,8 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1
 
 %build
 %mvn_build
@@ -44,6 +49,9 @@ API documentation for %{name}.
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Apr  8 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1-1
+- Update to upstream version 1.1
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 5135d93..346c167 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e1249e4021e70040284c7e9d0a34844  maven-docck-plugin-1.0.tar.bz2
+6612801bf4f7476bcf75662f6574b911  maven-docck-plugin-1.1-source-release.zip
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/maven-docck-plugin.git/commit/?h=master&id=dcf42c093e9a866671b63398d91cacbdeafc5722


More information about the scm-commits mailing list