rpms/jetty/devel site.xml, NONE, 1.1 jetty-plugin-fix-site.patch, NONE, 1.1 jetty.spec, 1.24, 1.25 sources, 1.6, 1.7 disable-modules.patch, 1.2, 1.3 .cvsignore, 1.6, 1.7 jetty-depmap.xml, 1.2, 1.3
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Jun 15 13:28:43 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10670/devel
Modified Files:
jetty.spec sources disable-modules.patch .cvsignore
jetty-depmap.xml
Added Files:
site.xml jetty-plugin-fix-site.patch
Log Message:
Update to 6.1.24.
--- NEW FILE site.xml ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-default-skin</artifactId>
<version>1.0.1</version>
</skin>
<body>
</body>
</project>
jetty-plugin-fix-site.patch:
pom.xml | 39 ---------------------------------------
1 file changed, 39 deletions(-)
--- NEW FILE jetty-plugin-fix-site.patch ---
--- modules/maven-plugin/pom.xml.sav 2010-04-21 21:03:31.000000000 +0300
+++ modules/maven-plugin/pom.xml 2010-05-26 01:15:21.159278193 +0300
@@ -27,45 +27,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>exec-plugin-doc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>xdoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/site-component.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<dependencies>
Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- jetty.spec 2 Dec 2009 22:15:26 -0000 1.24
+++ jetty.spec 15 Jun 2010 13:28:42 -0000 1.25
@@ -41,8 +41,8 @@
%define appdir %{jettylibdir}/webapps
Name: jetty
-Version: 6.1.21
-Release: 4%{?dist}
+Version: 6.1.24
+Release: 1%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
@@ -54,11 +54,13 @@ Source2: jetty.init
Source3: jetty.logrotate
Source4: %{name}-depmap.xml
Source7: %{name}-settings.xml
+Source8: site.xml
Patch0: disable-modules.patch
# Fix issues with CookieDump example
Patch1: jetty-cookiedump.patch
# Fix issues with error logging
Patch2: jetty-log.patch
+Patch4: jetty-plugin-fix-site.patch
Patch5: jetty-unix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,20 +69,20 @@ BuildRequires: fedora-usermgmt-devel
%{?FE_USERADD_REQ}
BuildRequires: jpackage-utils >= 0:1.6
# build only
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-dependency
-BuildRequires: maven2-plugin-enforcer
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-project-info-reports
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
-BuildRequires: maven2-plugin-source
-BuildRequires: maven2-plugin-remote-resources
-BuildRequires: maven2-plugin-war
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-project-info-reports-plugin
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-remote-resources-plugin
+BuildRequires: maven-war-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-shared-dependency-tree
@@ -90,21 +92,23 @@ BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: tomcat6-jsp-2.1-api
BuildRequires: slf4j
BuildRequires: objectweb-asm
-BuildRequires: jakarta-commons-el
+BuildRequires: apache-commons-el
BuildRequires: jakarta-commons-daemon
+BuildRequires: geronimo-jta
+BuildRequires: geronimo-parent-poms
Requires: chkconfig
Requires: jpackage-utils >= 0:1.6
Requires: ant >= 0:1.6
-Requires: jakarta-commons-el
-Requires: jakarta-commons-logging
+Requires: apache-commons-el
+Requires: apache-commons-logging
Requires: tomcat5-jasper >= 5.5.26-1.5
Requires: jsp
Requires: mx4j >= 0:3.0
Requires: tomcat6-servlet-2.5-api
Requires: tomcat6-jsp-2.1-api
Requires: slf4j
-Requires: classpathx-mail
+Requires: javamail
Requires: xerces-j2 >= 0:2.7
Requires: xml-commons-apis
Requires(post): jpackage-utils >= 0:1.6
@@ -148,9 +152,10 @@ for f in $(find . -name "*.?ar"); do rm
find . -name "*.class" -exec rm {} \;
%patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
+#%patch1 -b .sav
+#%patch2 -b .sav
#%patch5
+%patch4 -b .sav
cp %{SOURCE7} settings.xml
@@ -174,27 +179,20 @@ sed -i "s|zip \$D/\$N|zip \$D/\$N/\$N|g"
sed -i "s|# look for JETTY_HOME|export JETTY_HOME=/usr/share/jetty|g" bin/jetty-xinetd.sh
-%build
-sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
-sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
+mkdir -p src/site
+cp %{SOURCE8} src/site/site.xml
+%build
sed -i -e "s|/usr/share|%{_datadir}|g" djetty
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
mvn-jpp \
-e \
- -s $(pwd)/settings.xml \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.depmap.file=%{SOURCE4} \
-Dmaven.test.skip=true \
+ -DupdateReleaseInfo=true \
install
#pushd distribution/jetty-assembly
@@ -387,6 +385,9 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Tue Jun 15 2010 Alexander Kurtakov <akurtako at redhat.com> 6.1.24-1
+- Update to 6.1.24.
+
* Wed Dec 02 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.21-4
- Resovles #543081
- Add maven depmap fragments.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 29 Sep 2009 08:33:40 -0000 1.6
+++ sources 15 Jun 2010 13:28:42 -0000 1.7
@@ -1 +1,2 @@
e89beb5020232aeabdcd8ce85cfa79e1 jetty-6.1.21-src.zip
+b0cf09d88dabf1762a8399692a8a479f jetty-6.1.24-src.zip
disable-modules.patch:
pom.xml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
Index: disable-modules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/disable-modules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- disable-modules.patch 29 Sep 2009 08:29:09 -0000 1.2
+++ disable-modules.patch 15 Jun 2010 13:28:42 -0000 1.3
@@ -1,6 +1,6 @@
---- pom.xml.sav 2009-09-22 10:17:54.000000000 +0300
-+++ pom.xml 2009-09-29 11:01:34.323185945 +0300
-@@ -61,12 +61,12 @@
+--- pom.xml.sav 2010-04-21 20:43:51.000000000 +0300
++++ pom.xml 2010-05-26 01:45:43.075278425 +0300
+@@ -62,12 +62,12 @@
<target>1.4</target>
</configuration>
</plugin>
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
-@@ -110,24 +110,24 @@
+@@ -111,47 +111,47 @@
<module>modules/util</module>
<module>modules/util5</module>
<module>modules/jetty</module>
@@ -47,8 +47,16 @@
<!--module>extras/gwt</module-->
<module>extras/threadpool</module>
<module>extras/client</module>
-@@ -141,16 +141,16 @@
- <module>examples/tests</module>
+ <module>extras/jetty-java5-stats</module>
+
+ <module>examples/test-webapp</module>
+- <module>examples/test-jaas-webapp</module>
++ <!--module>examples/test-jaas-webapp</module-->
+ <module>examples/test-jndi-webapp</module>
+ <module>examples/embedded</module>
+ <!-- <module>examples/spring-ebj3-demo</module> -->
+- <module>examples/tests</module>
++ <!--module>examples/tests</module-->
- <module>contrib/cometd</module>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 29 Sep 2009 08:33:40 -0000 1.6
+++ .cvsignore 15 Jun 2010 13:28:42 -0000 1.7
@@ -3,3 +3,4 @@ jetty-5.1.14.fedora.tgz
jetty-5.1.15.fedora.tgz
jetty-6.1.20-src.zip
jetty-6.1.21-src.zip
+jetty-6.1.24-src.zip
Index: jetty-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jetty-depmap.xml 29 Sep 2009 08:29:09 -0000 1.2
+++ jetty-depmap.xml 15 Jun 2010 13:28:42 -0000 1.3
@@ -178,13 +178,6 @@
<version>6.1.20</version>
</maven>
</dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-default-skin</artifactId>
- <version>2.0.8</version>
- </maven>
- </dependency>
</dependencies>
More information about the scm-commits
mailing list