commit 7d7935aa8d33f7569a00a2a14da417adc342c8d1
Merge: 7ebedb1 a7e003f
Author: Jeff Johnston <jjohnstn@xxxxxxxxxx>
Date: Wed Nov 24 14:36:53 2010 -0500
- Resolves #652020
- Remove tomcat5 references and replace with appropriate alternatives.
.gitignore | 1 +
disable-modules.patch | 15 ---
jetty-cookiedump.patch | 38 ------
jetty-depmap.xml | 34 +-----
jetty-log.patch | 321 ------------------------------------------------
jetty-settings.xml | 47 -------
jetty-unix.patch | 83 -------------
jetty.spec | 53 ++++-----
site.xml | 10 --
sources | 3 +-
10 files changed, 26 insertions(+), 579 deletions(-)
---
diff --cc jetty-depmap.xml
index d5ce978,3ffb125..b7d84c8
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@@ -73,66 -73,6 +73,62 @@@
</dependency>
<dependency>
<maven>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
- <version>1.6.5</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>ant</artifactId>
- <version>1.7.1</version>
++ <version>1.6</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.15</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/tomcat6</groupId>
+ <artifactId>jasper-jdt</artifactId>
+ <version>6.0.18</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
- <version>5.5.15</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/tomcat6</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.26</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
- <version>5.5.15</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/tomcat6</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.26</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>
@@@ -169,25 -109,26 +165,6 @@@
</dependency>
<dependency>
<maven>
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- <version>1.0.1</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>commons-daemon</artifactId>
- <version>1.0.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>1.0.1</version>
- </maven>
- </dependency>
- <dependency>
- <maven>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>ant</artifactId>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>jasper5-compiler</artifactId>
- </jpp>
- </dependency>
- <dependency>
- <maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-apacheds</artifactId>
<version>1.0-alpha-1</version>
diff --cc jetty.spec
index c5a1cd5,4985bb0..5ef7d5e
--- a/jetty.spec
+++ b/jetty.spec
@@@ -28,21 -28,21 +28,21 @@@
# 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}
+Release: 2%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
@@@ -85,11 -77,12 +78,12 @@@ BuildRequires: maven-assembly-plugi
BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-war-plugin
BuildRequires: maven-plugin-bundle
- BuildRequires: maven-surefire-maven-plugin
+ BuildRequires: maven-release-plugin
+ BuildRequires: maven-surefire-plugin
BuildRequires: maven-shared-dependency-tree
-BuildRequires: tomcat5-jasper
-BuildRequires: tomcat6-servlet-2.5-api
-BuildRequires: tomcat6-jsp-2.1-api
+BuildRequires: tomcat6-lib
+BuildRequires: servlet25
+BuildRequires: jsp21
BuildRequires: slf4j
BuildRequires: objectweb-asm
BuildRequires: apache-commons-el
@@@ -385,10 -374,9 +375,13 @@@ f
%doc %{_docdir}/%{name}-%{version}
%changelog
- * Mon Nov 22 2010 Jeff Johnston <jjohnstn@xxxxxxxxxx> 6.1.24-2
++* Mon Nov 22 2010 Jeff Johnston <jjohnstn@xxxxxxxxxx> 6.1.26-2
+- Resolves #652020
+- Remove tomcat5 references and replace with appropriate alternatives.
+
+ * 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.
--
java-devel mailing list
java-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/java-devel
