[ini4j/f17] Removed maven-license-plugin BR

Tomas Radej tradej at fedoraproject.org
Fri May 4 13:58:13 UTC 2012


commit 9b7319ee85c5d5326b535c874eb180089346301f
Author: Tomas Radej <tradej at redhat.com>
Date:   Fri May 4 14:22:52 2012 +0200

    Removed maven-license-plugin BR

 ini4j-remove-license-plugin.patch |   47 +++++++++++++++++++++++++++++++++++++
 ini4j.spec                        |   10 ++++++-
 2 files changed, 55 insertions(+), 2 deletions(-)
---
diff --git a/ini4j-remove-license-plugin.patch b/ini4j-remove-license-plugin.patch
new file mode 100644
index 0000000..7454e2b
--- /dev/null
+++ b/ini4j-remove-license-plugin.patch
@@ -0,0 +1,47 @@
+diff --git a/pom.xml b/pom.xml
+index 3401adf..631fdf7 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -278,42 +278,6 @@
+                     <generatedSiteDirectory>${basedir}/target/generated-site</generatedSiteDirectory>
+                 </configuration>
+             </plugin>
+-            <plugin>
+-                <groupId>com.mycila.maven-license-plugin</groupId>
+-                <artifactId>maven-license-plugin</artifactId>
+-                <version>1.4.0</version>
+-                <inherited>true</inherited>
+-                <configuration>
+-                    <aggregate>true</aggregate>
+-                    <encoding>UTF-8</encoding>
+-                    <useDefaultExcludes>true</useDefaultExcludes>
+-                    <header>NOTICE.txt</header>
+-                    <excludes>
+-                        <exclude>**/META-INF/services/**</exclude>
+-                        <exclude>**/*.txt</exclude>
+-                        <exclude>**/*.apt</exclude>
+-                        <exclude>**/*.reg</exclude>
+-                        <exclude>**/.htaccess</exclude>
+-                    </excludes>
+-                    <mapping>
+-                        <java>SLASHSTAR_STYLE</java>
+-                        <css>SLASHSTAR_STYLE</css>
+-                        <js>SLASHSTAR_STYLE</js>
+-                        <ini>SEMICOLON_STYLE</ini>
+-                        <opt>SCRIPT_STYLE</opt>
+-                    </mapping>
+-                    <useDefaultMapping>true</useDefaultMapping>
+-                </configuration>
+-                <executions>
+-                    <execution>
+-                        <phase>initialize</phase>
+-                        <goals>
+-                            <goal>format</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-
+ 
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ini4j.spec b/ini4j.spec
index 2cd3d60..7657015 100644
--- a/ini4j.spec
+++ b/ini4j.spec
@@ -1,6 +1,6 @@
 Name:           ini4j
 Version:        0.5.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java API for handling files in Windows .ini format
 Group:          Development/Libraries
 License:        ASL 2.0
@@ -18,6 +18,9 @@ Patch3:         %{name}-remove-test-dependencies.patch
 # thanks to heffer for pointing this out
 Patch4:         %{name}-remove-checkstyle-and-pmd-checks.patch
 Patch5:         %{name}-encoding.patch
+# removing maven-license-plugin BR
+Patch6:         %{name}-remove-license-plugin.patch
+
 BuildArch:      noarch
 
 # See http://ini4j.sourceforge.net/dependencies.html
@@ -37,7 +40,6 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-release-plugin
 BuildRequires:  maven-site-plugin
-BuildRequires:  maven-license-plugin
 BuildRequires:  maven-source-plugin
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  plexus-mail-sender
@@ -76,6 +78,7 @@ find . -type f \( -iname "*.jar" -o -iname "*.class" -o -iname "*.exe" -o -iname
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %build
@@ -119,6 +122,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 
 %changelog
+* Fri May 04 2012 Tomas Radej <tradej at redhat.com> - 0.5.1-6
+- Removed maven-license-plugin BR
+
 * Fri Apr 13 2012 Tomas Radej <tradej at redhat.com> - 0.5.1-5
 - Changed javadoc:aggregate
 - Fixed release number


More information about the scm-commits mailing list