Attachment 587117 Details for Bug 825455 – Added maven POM (add mvn BR)

[patch] Added maven POM (add mvn BR)

0001-Add-maven-POM.patch (text/plain), 16.48 KB, created by gil cattaneo on 2012-05-27 21:48:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-27 21:48:59 UTC

Size: 16.48 KB

patch

obsolete

>From b4580279766b251ec7b9e8def0ab1ece65183a8d Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Sun, 27 May 2012 21:48:07 +0200
>Subject: [PATCH] Add maven POM
>
>---
> apache-commons-modeler-2.0.1-pom.patch |  126 +++++++++++++++++++++
> apache-commons-modeler.spec            |   83 +++++++++++----
> commons-modeler-2.0.1.pom              |  186 ++++++++++++++++++++++++++++++++
> 3 files changed, 375 insertions(+), 20 deletions(-)
> create mode 100644 apache-commons-modeler-2.0.1-pom.patch
> create mode 100644 commons-modeler-2.0.1.pom
>
>diff --git a/apache-commons-modeler-2.0.1-pom.patch b/apache-commons-modeler-2.0.1-pom.patch
>new file mode 100644
>index 0000000..6c3632e
>--- /dev/null
>+++ b/apache-commons-modeler-2.0.1-pom.patch
>@@ -0,0 +1,126 @@
>+--- pom.xml	2007-06-25 20:16:17.000000000 +0200
>++++ pom.xml-gil	2012-05-26 12:38:35.549638157 +0200
>+@@ -5,9 +5,9 @@
>+   <name>Commons Modeler</name>
>+   <version>2.0.1</version>
>+   <description>Commons Modeler</description>
>+-  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
>++  <url>http://jakarta.apache.org/commons/commons-modeler/</url>
>+   <issueManagement>
>+-    <url>http://issues.apache.org/jira/browse/${pom.artifactId.substring(8).toUpperCase()}</url>
>++    <url>http://issues.apache.org/jira/browse/commons-modeler</url>
>+   </issueManagement>
>+   <ciManagement>
>+     <notifiers>
>+@@ -66,12 +66,13 @@
>+     </license>
>+   </licenses>
>+   <scm>
>+-    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
>+-    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
>++    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/modeler/trunk</connection>
>++    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/modeler/trunk</developerConnection>
>++    <url>http://svn.apache.org/viewvc/commons/proper/modeler/trunk</url>
>+   </scm>
>+   <organization>
>+     <name>The Apache Software Foundation</name>
>+-    <url>http://jakarta.apache.org</url>
>++    <url>http://commons.apache.org/modeler/</url>
>+   </organization>
>+   <build>
>+     <sourceDirectory>src/java</sourceDirectory>
>+@@ -101,7 +102,7 @@
>+     </resources>
>+     <testResources>
>+       <testResource>
>+-        <directory>${pom.build.unitTestSourceDirectory}</directory>
>++        <directory>${project.build.unitTestSourceDirectory}</directory>
>+         <includes>
>+           <include>**/*.xml</include>
>+         </includes>
>+@@ -109,6 +110,7 @@
>+     </testResources>
>+     <plugins>
>+       <plugin>
>++        <groupId>org.apache.maven.plugins</groupId>
>+         <artifactId>maven-surefire-plugin</artifactId>
>+         <configuration>
>+           <includes>
>+@@ -117,6 +119,7 @@
>+         </configuration>
>+       </plugin>
>+       <plugin>
>++        <groupId>org.apache.maven.plugins</groupId>
>+         <artifactId>maven-changelog-plugin</artifactId>
>+         <version>1.9.1</version>
>+         <configuration>
>+@@ -124,13 +127,22 @@
>+               required for building the Site documentation.</comment>
>+         </configuration>
>+       </plugin>
>+-      <plugin>
>++      
>++      <plugin>
>++        <groupId>org.apache.maven.plugins</groupId>
>++        <artifactId>maven-jar-plugin</artifactId>
>++        <configuration>
>++          <archive>
>++            <manifestFile>src/conf/MANIFEST.MF</manifestFile>
>++          </archive>
>++        </configuration>
>+       </plugin>
>+     </plugins>
>+   </build>
>+@@ -145,12 +157,12 @@
>+       <artifactId>commons-logging-api</artifactId>
>+       <version>1.0.4</version>
>+     </dependency>
>+-    <dependency>
>++    
>+     <dependency>
>+       <groupId>xml-apis</groupId>
>+       <artifactId>xml-apis</artifactId>
>+@@ -164,23 +176,23 @@
>+       <scope>test</scope>
>+     </dependency>
>+     <dependency>
>+-      <groupId>ant</groupId>
>++      <groupId>org.apache.ant</groupId>
>+       <artifactId>ant</artifactId>
>+-      <version>1.5</version>
>++      <version>1.8.2</version>
>+       <optional>true</optional>
>+     </dependency>
>+   </dependencies>
>+-  <distributionManagement>
>++  
>+ </project>
>+\ Manca newline alla fine del file
>diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
>index 025dc42..f545616 100644
>--- a/apache-commons-modeler.spec
>+++ b/apache-commons-modeler.spec
>@@ -1,15 +1,25 @@
> %global base_name       modeler
> %global short_name      commons-%{base_name}
> 
>+%global with_maven      1
>+
> Name:             apache-%{short_name}
> Version:          2.0.1
>-Release:          8%{?dist}
>+Release:          9%{?dist}
> Summary:          Model MBeans utility classes
> Group:            Development/Libraries
> License:          ASL 2.0
> URL:              http://commons.apache.org/%{base_name}/
> Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
>-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+Source1:          http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
>+# remove 
>+#    maven-xdoc-plugin
>+#    mx4j mx4j-jmx 2.1.1
>+# fix ant gId
>+# add maven-jar-plugin configuration
>+# update some references
>+Patch0:           apache-commons-modeler-2.0.1-pom.patch
>+
> BuildArch:        noarch
> 
> BuildRequires:    java-devel >= 1:1.6.0
>@@ -20,13 +30,22 @@ BuildRequires:    apache-commons-digester
> BuildRequires:    apache-commons-logging
> BuildRequires:    junit
> 
>+%if %with_maven
>+BuildRequires:    maven
>+BuildRequires:    maven-compiler-plugin
>+BuildRequires:    maven-install-plugin
>+BuildRequires:    maven-jar-plugin
>+BuildRequires:    maven-javadoc-plugin
>+BuildRequires:    maven-resources-plugin
>+BuildRequires:    maven-surefire-plugin
>+BuildRequires:    maven-surefire-provider-junit4
>+%endif
>+
> Requires:         java >= 1:1.6.0
> Requires:         jpackage-utils
> Requires:         apache-commons-beanutils
> Requires:         apache-commons-digester
> Requires:         apache-commons-logging
>-Requires(post):   jpackage-utils
>-Requires(postun): jpackage-utils
> 
> # This should go away with F-17
> Provides:         jakarta-%{short_name} = 0:%{version}-%{release}
>@@ -54,7 +73,14 @@ sed -i 's/\r//' LICENSE.txt
> sed -i 's/\r//' RELEASE-NOTES.txt
> sed -i 's/\r//' NOTICE.txt
> 
>+cp -p %{SOURCE1} pom.xml
>+%patch0 -p0
>+
> %build
>+
>+%if %with_maven
>+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
>+%else
> # TODO: Use Maven for building as soon as upstream provides proper build.xml. 
> export CLASSPATH=$(build-classpath \
>                    apache-commons-logging \
>@@ -63,36 +89,54 @@ export CLASSPATH=$(build-classpath \
>                    junit )
> 
> ant -Dbuild.sysclasspath=first test dist
>+%endif
> 
> %install
>-rm -rf %{buildroot}
> 
> # jars
> install -d -m 0755 %{buildroot}%{_javadir}
>-install -pm 644 dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
>-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
>-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
>+%if %with_maven
>+install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
>+%else
>+install -pm 644 dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
>+%endif
> 
>-# javadoc
>-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
>-cp -pr dist/docs/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
>-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
>+( cd %{buildroot}%{_javadir} && ln -sf %{name}.jar %{short_name}.jar )
> 
>-%clean
>-rm -rf %{buildroot}
>+# pom
>+install -d -m 755 %{buildroot}%{_mavenpomdir}
>+install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
>+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
>+
>+# javadoc
>+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
>+%if %with_maven
>+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
>+%else
>+cp -pr dist/docs/api*/* %{buildroot}%{_javadocdir}/%{name}
>+%endif
> 
> %files
>-%defattr(-,root,root,-)
> %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
>-%{_javadir}/*
>+%{_javadir}/%{name}.jar
>+%{_javadir}/%{short_name}.jar
>+%{_mavenpomdir}/JPP-%{short_name}.pom
>+%{_mavendepmapfragdir}/%{name}
>+
>+%pre javadoc
>+# workaround for rpm bug, can be removed in F-18
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %doc LICENSE.txt
>-%{_javadocdir}/%{name}-%{version}
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Sat May 26 2012 gil cattaneo <puntogil@libero.it> 2.0.1-9
>+- Add maven POM
>+- Adapt to current guideline
>+
> * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>@@ -100,5 +144,4 @@ rm -rf %{buildroot}
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
> 
> * Sat Oct 2 2010 Chris Spike <chris.spike@arcor.de> 2.0.1-6
>-- Rename and rebase from jakarta-commons-modeler
>-
>+- Rename and rebase from jakarta-commons-modeler
>\ No newline at end of file
>diff --git a/commons-modeler-2.0.1.pom b/commons-modeler-2.0.1.pom
>new file mode 100644
>index 0000000..2088f84
>--- /dev/null
>+++ b/commons-modeler-2.0.1.pom
>@@ -0,0 +1,186 @@
>+<?xml version="1.0" encoding="UTF-8"?><project>
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>commons-modeler</groupId>
>+  <artifactId>commons-modeler</artifactId>
>+  <name>Commons Modeler</name>
>+  <version>2.0.1</version>
>+  <description>Commons Modeler</description>
>+  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
>+  <issueManagement>
>+    <url>http://issues.apache.org/jira/browse/${pom.artifactId.substring(8).toUpperCase()}</url>
>+  </issueManagement>
>+  <ciManagement>
>+    <notifiers>
>+      <notifier>
>+        <configuration>
>+          <address>commons-dev@jakarta.apache.org</address>
>+        </configuration>
>+      </notifier>
>+    </notifiers>
>+  </ciManagement>
>+  <inceptionYear>2002</inceptionYear>
>+  <mailingLists>
>+    <mailingList>
>+      <name>Commons Dev List</name>
>+      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
>+      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
>+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
>+    </mailingList>
>+    <mailingList>
>+      <name>Commons User List</name>
>+      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
>+      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
>+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
>+    </mailingList>
>+  </mailingLists>
>+  <developers>
>+    <developer>
>+      <id>craigmcc</id>
>+      <name>Craig McClanahan</name>
>+      <email>craigmcc@apache.org</email>
>+      <organization>Apache</organization>
>+    </developer>
>+    <developer>
>+      <id>yoavs</id>
>+      <name>Yoav Shapira</name>
>+      <email>yoavs@apache.org</email>
>+      <organization>Apache</organization>
>+    </developer>
>+    <developer>
>+      <id>billbarker</id>
>+      <name>Bill Barker</name>
>+      <email>billbarker@apache.org</email>
>+      <organization>Apache</organization>
>+    </developer>
>+    <developer>
>+      <id>dims</id>
>+      <name>Davanum Srinivas</name>
>+      <email>dims@apache.org</email>
>+      <organization>Apache</organization>
>+    </developer>
>+  </developers>
>+  <licenses>
>+    <license>
>+      <name>The Apache Software License, Version 2.0</name>
>+      <url>/LICENSE.txt</url>
>+    </license>
>+  </licenses>
>+  <scm>
>+    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
>+    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
>+  </scm>
>+  <organization>
>+    <name>The Apache Software Foundation</name>
>+    <url>http://jakarta.apache.org</url>
>+  </organization>
>+  <build>
>+    <sourceDirectory>src/java</sourceDirectory>
>+    <testSourceDirectory>src/test</testSourceDirectory>
>+    <resources>
>+      <resource>
>+        <targetPath>META-INF</targetPath>
>+        <directory>.</directory>
>+        <includes>
>+          <include>NOTICE.txt</include>
>+        </includes>
>+      </resource>
>+      <resource>
>+        <targetPath>META-INF</targetPath>
>+        <directory>src/java/org/apache/commons/modeler/ant</directory>
>+        <includes>
>+          <include>ant.properties</include>
>+        </includes>
>+      </resource>
>+      <resource>
>+        <directory>src/java</directory>
>+        <includes>
>+          <include>**/ant.properties</include>
>+          <include>**/mbeans-descriptors.dtd</include>
>+        </includes>
>+      </resource>
>+    </resources>
>+    <testResources>
>+      <testResource>
>+        <directory>${pom.build.unitTestSourceDirectory}</directory>
>+        <includes>
>+          <include>**/*.xml</include>
>+        </includes>
>+      </testResource>
>+    </testResources>
>+    <plugins>
>+      <plugin>
>+        <artifactId>maven-surefire-plugin</artifactId>
>+        <configuration>
>+          <includes>
>+            <include>**/*TestCase.java</include>
>+          </includes>
>+        </configuration>
>+      </plugin>
>+      <plugin>
>+        <artifactId>maven-changelog-plugin</artifactId>
>+        <version>1.9.1</version>
>+        <configuration>
>+          <comment>&lt;strong>Site Only&lt;/strong> - v1.9.1 (minimum)
>+              required for building the Site documentation.</comment>
>+        </configuration>
>+      </plugin>
>+      <plugin>
>+        <artifactId>maven-xdoc-plugin</artifactId>
>+        <version>1.9.2</version>
>+        <configuration>
>+          <comment>&lt;strong>Site Only&lt;/strong> - v1.9.2 (minimum)
>+              required for building the Site documentation.</comment>
>+        </configuration>
>+      </plugin>
>+    </plugins>
>+  </build>
>+  <dependencies>
>+    <dependency>
>+      <groupId>commons-digester</groupId>
>+      <artifactId>commons-digester</artifactId>
>+      <version>1.4.1</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>commons-logging</groupId>
>+      <artifactId>commons-logging-api</artifactId>
>+      <version>1.0.4</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>mx4j</groupId>
>+      <artifactId>mx4j-jmx</artifactId>
>+      <version>2.1.1</version>
>+      <scope>provided</scope>
>+    </dependency>
>+    <dependency>
>+      <groupId>xml-apis</groupId>
>+      <artifactId>xml-apis</artifactId>
>+      <version>2.0.2</version>
>+      <scope>provided</scope>
>+    </dependency>
>+    <dependency>
>+      <groupId>junit</groupId>
>+      <artifactId>junit</artifactId>
>+      <version>3.7</version>
>+      <scope>test</scope>
>+    </dependency>
>+    <dependency>
>+      <groupId>ant</groupId>
>+      <artifactId>ant</artifactId>
>+      <version>1.5</version>
>+      <optional>true</optional>
>+    </dependency>
>+  </dependencies>
>+  <distributionManagement>
>+    <repository>
>+      <id>default</id>
>+      <name>Default Repository</name>
>+      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
>+    </repository>
>+    <site>
>+      <id>default</id>
>+      <name>Default Site</name>
>+      <url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
>+    </site>
>+    <status>converted</status>
>+  </distributionManagement>
>+</project>
>\ No newline at end of file
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 825455: 587013 | 587117