[java-sig-commits] [jetty] Adapt build for maven 3.x.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Jun 28 19:52:09 UTC 2011 

commit d45248bf96cd4c566eef4793c0a408f84f10ab1e
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jun 28 22:51:37 2011 +0300

    Adapt build for maven 3.x.

 jetty-depmap.xml            |   23 ++++++++++++++++++++
 jetty-plugin-fix-site.patch |   48 -------------------------------------------
 jetty.spec                  |   47 ++++++++++++++++--------------------------
 3 files changed, 41 insertions(+), 77 deletions(-)
---
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index 2c6e256..0f7c2be 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -141,6 +141,18 @@
 	</dependency>
 	<dependency>
 		<maven>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-tools-api</artifactId>
+			<version>2.0</version>
+		</maven>
+	    <jpp>
+          <groupId>JPP/maven-plugin-tools</groupId>
+          <artifactId>api</artifactId>
+          <version>2.7</version>
+        </jpp>
+	</dependency>
+	<dependency>
+		<maven>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-apacheds</artifactId>
 			<version>1.0-alpha-1</version>
@@ -160,4 +172,15 @@
 			<version>6.1.20</version>
 		</maven>
 	</dependency>
+	<dependency>
+		<maven>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-descriptor</artifactId>
+			<version>2.0.6</version>
+		</maven>
+		<jpp>
+          <groupId>JPP/maven</groupId>
+          <artifactId>maven-compat</artifactId>
+        </jpp>
+	</dependency>
 </dependencies>
diff --git a/jetty.spec b/jetty.spec
index 671081a..9b5a8ea 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.26
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -55,8 +55,6 @@ Source3:        jetty.logrotate
 Source4:        %{name}-depmap.xml
 Patch0:	        disable-modules.patch
 Patch1:	        jetty-util-pom.patch
-Patch4:	        jetty-plugin-fix-site.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  fedora-usermgmt-devel
@@ -92,6 +90,8 @@ BuildRequires: geronimo-jta
 BuildRequires: geronimo-parent-poms
 BuildRequires: apache-commons-parent
 BuildRequires: derby
+BuildRequires: tomcat6-lib
+BuildRequires: maven-skins
 
 Requires:  chkconfig
 Requires:  jpackage-utils >= 0:1.6
@@ -147,7 +147,6 @@ find . -name "*.class" -exec rm {} \;
 
 %patch0 -b .sav
 %patch1 -b .sav
-%patch4 -b .sav
 
 cp %{SOURCE1} djetty
 
@@ -163,8 +162,9 @@ sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/naming/pom.xml
 sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/naming/pom.xml
 sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/annotations/pom.xml
 sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/annotations/pom.xml
+sed -i "s|jcl104-over-slf4j|slf4j-jcl|g" modules/jsp-2.0/pom.xml 
 
-sed -i "s|mvn|mvn-jpp|g" distribution/jetty-assembly/pom.xml
+sed -i "s|mvn|mvn-rpmbuild|g" distribution/jetty-assembly/pom.xml
 
 sed -i "s|zip \$D/\$N|zip \$D/\$N/\$N|g" bin/build_release_bundles.sh
 
@@ -173,12 +173,9 @@ sed -i "s|# look for JETTY_HOME|export JETTY_HOME=/usr/share/jetty|g" bin/jetty-
 %build
 sed -i -e "s|/usr/share|%{_datadir}|g" djetty
 
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
-mvn-jpp \
+mvn-rpmbuild \
     -e \
-    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-    -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+    -Dmaven.local.depmap.file=%{SOURCE4} \
     -Dmaven.test.skip=true \
     -DupdateReleaseInfo=true \
     install
@@ -196,21 +193,20 @@ mvn-jpp \
 sh bin/build_release_bundles.sh .
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # dirs
 install -dm 755 $RPM_BUILD_ROOT%{_bindir}
 install -dm 755 $RPM_BUILD_ROOT%{_initrddir}
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.jetty-jetty.pom
-install -pm 644 modules/util/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.jetty-jetty-util.pom
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty.pom
+install -pm 644 modules/util/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-util.pom
 
 %add_to_maven_depmap org.mortbay.jetty jetty %{version} JPP/jetty jetty
 %add_to_maven_depmap org.mortbay.jetty jetty-util %{version} JPP/jetty jetty-util
 
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 install -dm 755 $RPM_BUILD_ROOT%{confdir}
 install -dm 755 $RPM_BUILD_ROOT%{homedir}
 install -dm 755 $RPM_BUILD_ROOT%{logdir}
@@ -229,9 +225,7 @@ ln -s %{homedir}/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
 install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 echo '# Placeholder configuration file.  No default is provided.' > $RPM_BUILD_ROOT%{confdir}/jetty.conf
-ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
 ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
-ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util-%{version}.jar
 ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util.jar
 ( cat << EO_RC
 JAVA_HOME=/usr/lib/jvm/java
@@ -245,7 +239,7 @@ EO_RC
 ) > $RPM_BUILD_ROOT%{homedir}/.jettyrc
 
 # javadoc
-mv $RPM_BUILD_ROOT%{homedir}/jxr/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mv $RPM_BUILD_ROOT%{homedir}/jxr/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # manual
 install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -309,9 +303,6 @@ build-jar-repository . tomcat6-servlet-2.5-api
 rm -fr servlet-api-*.jar
 popd
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %pre
 # Add the "jetty" user and group
 %__fe_groupadd %jtuid -r %username &>/dev/null || :
@@ -338,15 +329,12 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/*
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/%{name}.jar
-%{_javadir}/%{name}/%{name}-%{version}.jar
 %{_javadir}/%{name}/%{name}-util.jar
-%{_javadir}/%{name}/%{name}-util-%{version}.jar
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 %config(noreplace) %{confdir}
 %dir %{jettylibdir}
 %dir %{jettycachedir}
@@ -363,14 +351,15 @@ fi
 %{_sysconfdir}/logrotate.d/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 %files manual
-%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Jun 28 2011 Alexander Kurtakov <akurtako at redhat.com> 6.1.26-7
+- Adapt build for maven 3.x.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1.26-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

More information about the java-sig-commits mailing list