[maven-license-plugin] Remove maven-eclipse-plugin requirement to simplify build

Stanislav Ochotnicky sochotni at fedoraproject.org
Tue Apr 24 07:16:01 UTC 2012


commit 4707011f3aff0d3173959d1eb42d07385e117e51
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue Apr 24 09:05:04 2012 +0200

    Remove maven-eclipse-plugin requirement to simplify build

 001-mavenlicenseplugin-fixbuild.patch |   39 ++++++++++++++++++++++++++++----
 maven-license-plugin.spec             |   24 +++++++++++---------
 2 files changed, 47 insertions(+), 16 deletions(-)
---
diff --git a/001-mavenlicenseplugin-fixbuild.patch b/001-mavenlicenseplugin-fixbuild.patch
index e2ca48c..fd37b01 100644
--- a/001-mavenlicenseplugin-fixbuild.patch
+++ b/001-mavenlicenseplugin-fixbuild.patch
@@ -1,6 +1,32 @@
---- A/pom.xml	2010-08-06 05:39:21.754029000 +0200
-+++ B/pom.xml	2010-10-08 00:48:04.001693009 +0200
-@@ -245,29 +245,6 @@
+From a1f7f0c16eb2333e527448c2e48a512ef8da50ed Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 24 Apr 2012 09:04:34 +0200
+Subject: [PATCH] Fix build by removing some unneeded dependencies
+
+---
+ pom.xml |   72 ++++++--------------------------------------------------------
+ 1 files changed, 7 insertions(+), 65 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index a806a49..e806c77 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -147,14 +147,6 @@
+             </plugin>
+             <!-- IDE descriptors -->
+             <plugin>
+-                <artifactId>maven-eclipse-plugin</artifactId>
+-                <configuration>
+-                    <downloadSources>true</downloadSources>
+-                    <downloadJavadocs>false</downloadJavadocs>
+-                    <addVersionToProjectName>true</addVersionToProjectName>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+                 <artifactId>maven-idea-plugin</artifactId>
+                 <configuration>
+                     <downloadSources>true</downloadSources>
+@@ -245,29 +237,6 @@
              <plugin>
                  <artifactId>maven-dependency-plugin</artifactId>
              </plugin>
@@ -30,7 +56,7 @@
          </plugins>
      </build>
  
-@@ -380,7 +357,12 @@
+@@ -380,7 +349,12 @@
          <dependency>
              <groupId>org.apache.maven</groupId>
              <artifactId>maven-plugin-api</artifactId>
@@ -44,7 +70,7 @@
          </dependency>
          <dependency>
              <groupId>com.mycila.xmltool</groupId>
-@@ -403,38 +385,6 @@
+@@ -403,38 +377,6 @@
              <artifactId>plexus-utils</artifactId>
              <version>1.5.1</version>
          </dependency>
@@ -85,3 +111,6 @@
 -</project>
 \ No newline at end of file
 +</project>
+-- 
+1.7.7.6
+
diff --git a/maven-license-plugin.spec b/maven-license-plugin.spec
index 640ff07..e3c23b2 100644
--- a/maven-license-plugin.spec
+++ b/maven-license-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-license-plugin
 Version:        1.8.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Maven plugin to update header licenses of source files
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@ URL:            http://code.google.com/p/maven-license-plugin
 ### upstream only provides binaries or source without build scripts
 # tar creation instructions
 # svn export http://maven-license-plugin.googlecode.com/svn/tags/maven-license-plugin-1.8.0 maven-license-plugin
-# tar cfJ maven-license-plugin-1.8.0.tar.xz maven-license-plugin 
+# tar cfJ maven-license-plugin-1.8.0.tar.xz maven-license-plugin
 Source0:        %{name}-%{version}.tar.xz
 # remove testng dep (tests are skipped) and maven-license-plugin call
 Patch0:         001-mavenlicenseplugin-fixbuild.patch
@@ -29,7 +29,6 @@ BuildRequires:  maven-changes-plugin
 BuildRequires:  maven-clean-plugin
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-eclipse-plugin
 BuildRequires:  maven-help-plugin
 BuildRequires:  maven-idea-plugin
 BuildRequires:  maven-install-plugin
@@ -48,19 +47,19 @@ BuildRequires:  plexus-classworlds
 BuildRequires:  xml-commons-apis
 BuildRequires:  xmltool
 
-Requires:       java 
+Requires:       java
 Requires:       jpackage-utils
 Requires:       maven
 Requires:       xmltool
 
 %description
-maven-license-plugin is a Maven plugin that help you managing license 
-headers in source files. Basically, when you are developing a project 
-either in open source or in a company, you often need to add at the top 
-of your source files a license to protect your work. 
-This plugin lets you maintain the headers, including checking if the 
-header is present, generating a report and of course having the 
-possibility to update / reformat missing license headers. 
+maven-license-plugin is a Maven plugin that help you managing license
+headers in source files. Basically, when you are developing a project
+either in open source or in a company, you often need to add at the top
+of your source files a license to protect your work.
+This plugin lets you maintain the headers, including checking if the
+header is present, generating a report and of course having the
+possibility to update / reformat missing license headers.
 
 
 %package javadoc
@@ -112,6 +111,9 @@ install -pm 644 pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Apr 24 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.8.0-8
+- Remove maven-eclipse-plugin requirement to simplify build
+
 * Tue Apr 17 2012 Tomas Radej <tradej at redhat.com> - 1.8.0-7
 - Apache-resource-bundles BR
 - Guidelines fixes


More information about the scm-commits mailing list