commit 4d81b2271579755cd0d2aac15f2e44de258f7c42
Author: Alexander Kurtakov <akurtako@xxxxxxxxxx>
Date: Fri Nov 12 16:24:52 2010 +0200
- Update to 6.1.26.
.gitignore | 1 +
disable-modules.patch | 15 ---
jetty-cookiedump.patch | 38 ------
jetty-depmap.xml | 50 ++------
jetty-log.patch | 321 ------------------------------------------------
jetty-settings.xml | 47 -------
jetty-unix.patch | 83 -------------
jetty.spec | 48 +++-----
site.xml | 10 --
sources | 3 +-
10 files changed, 29 insertions(+), 587 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0dcdb8..3e7a6ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ jetty-5.1.15.fedora.tgz
jetty-6.1.20-src.zip
jetty-6.1.21-src.zip
jetty-6.1.24-src.zip
+jetty-6.1.26-src.zip
diff --git a/disable-modules.patch b/disable-modules.patch
index 26b0e9a..f014937 100644
--- a/disable-modules.patch
+++ b/disable-modules.patch
@@ -1,20 +1,5 @@
--- 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>
-- <plugin>
-+ <!--plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.codehaus.org/jetty/jetty/tags</tagBase>
- </configuration>
-- </plugin>
-+ </plugin-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
@@ -111,47 +111,47 @@
<module>modules/util</module>
<module>modules/util5</module>
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index a3657b7..3ffb125 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -73,30 +73,6 @@
</dependency>
<dependency>
<maven>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.15</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>jasper5-compiler</artifactId>
- <version>5.5.27</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>3.0.1</version>
@@ -133,22 +109,23 @@
</dependency>
<dependency>
<maven>
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- <version>1.0.1</version>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
- <artifactId>commons-daemon</artifactId>
- <version>1.0.1</version>
+ <artifactId>ant</artifactId>
</jpp>
</dependency>
<dependency>
<maven>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>1.0.1</version>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
</maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>jasper5-compiler</artifactId>
+ </jpp>
</dependency>
<dependency>
<maven>
@@ -159,13 +136,6 @@
</dependency>
<dependency>
<maven>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.1.0</version>
- </maven>
- </dependency>
- <dependency>
- <maven>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
<version>1.0</version>
@@ -178,6 +148,4 @@
<version>6.1.20</version>
</maven>
</dependency>
-
</dependencies>
-
diff --git a/jetty.spec b/jetty.spec
index 50e65fb..05dd1e4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -28,20 +28,20 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define jettyname jetty
-%define jtuid 110
-%define username %{name}
-%define confdir %{_sysconfdir}/%{name}
-%define logdir %{_localstatedir}/log/%{name}
-%define homedir %{_datadir}/%{name}
-%define jettycachedir %{_localstatedir}/cache/%{name}
-%define tempdir %{jettycachedir}/temp
-%define rundir %{_localstatedir}/run/%{name}
-%define jettylibdir %{_localstatedir}/lib/%{name}
-%define appdir %{jettylibdir}/webapps
+%global jettyname jetty
+%global jtuid 110
+%global username %{name}
+%global confdir %{_sysconfdir}/%{name}
+%global logdir %{_localstatedir}/log/%{name}
+%global homedir %{_datadir}/%{name}
+%global jettycachedir %{_localstatedir}/cache/%{name}
+%global tempdir %{jettycachedir}/temp
+%global rundir %{_localstatedir}/run/%{name}
+%global jettylibdir %{_localstatedir}/lib/%{name}
+%global appdir %{jettylibdir}/webapps
Name: jetty
-Version: 6.1.24
+Version: 6.1.26
Release: 1%{?dist}
Summary: The Jetty Webserver and Servlet Container
@@ -53,15 +53,8 @@ Source1: djetty.script
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)
BuildArch: noarch
@@ -84,16 +77,15 @@ BuildRequires: maven-assembly-plugin
BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-war-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-shared-dependency-tree
-BuildRequires: tomcat5
BuildRequires: tomcat5-jasper
BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: tomcat6-jsp-2.1-api
BuildRequires: slf4j
BuildRequires: objectweb-asm
BuildRequires: apache-commons-el
-BuildRequires: jakarta-commons-daemon
+BuildRequires: apache-commons-daemon
BuildRequires: geronimo-jta
BuildRequires: geronimo-parent-poms
@@ -152,13 +144,8 @@ for f in $(find . -name "*.?ar"); do rm $f; done
find . -name "*.class" -exec rm {} \;
%patch0 -b .sav
-#%patch1 -b .sav
-#%patch2 -b .sav
-#%patch5
%patch4 -b .sav
-cp %{SOURCE7} settings.xml
-
cp %{SOURCE1} djetty
#remove glassfish specific file
@@ -167,6 +154,7 @@ rm -fr modules/jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/Jet
sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/management/pom.xml
sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/management/pom.xml
sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/jsp-2.0/pom.xml
+sed -i "s|<groupId>ant</groupId>|<groupId>org.apache.ant</groupId>|g" modules/jsp-2.0/pom.xml
sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/jsp-2.0/pom.xml
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
@@ -179,9 +167,6 @@ sed -i "s|zip \$D/\$N|zip \$D/\$N/\$N|g" bin/build_release_bundles.sh
sed -i "s|# look for JETTY_HOME|export JETTY_HOME=/usr/share/jetty|g" bin/jetty-xinetd.sh
-mkdir -p src/site
-cp %{SOURCE8} src/site/site.xml
-
%build
sed -i -e "s|/usr/share|%{_datadir}|g" djetty
@@ -385,6 +370,9 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Fri Nov 12 2010 Alexander Kurtakov <akurtako@xxxxxxxxxx> 6.1.26-1
+- Update to 6.1.26.
+
* Tue Jun 15 2010 Alexander Kurtakov <akurtako@xxxxxxxxxx> 6.1.24-1
- Update to 6.1.24.
diff --git a/sources b/sources
index e7e495f..83409a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-e89beb5020232aeabdcd8ce85cfa79e1 jetty-6.1.21-src.zip
-b0cf09d88dabf1762a8399692a8a479f jetty-6.1.24-src.zip
+4980757517064efbf655e025d005a0b8 jetty-6.1.26-src.zip
--
java-devel mailing list
java-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/java-devel
