You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by ma...@apache.org on 2020/02/21 12:07:25 UTC
svn commit: r1874315 - in /gump/metadata: profile/gump.xml
project/openssl-1.0.2.xml project/openssl-1.1.0.xml
project/tomcat-native-1.2-1.0.2.xml project/tomcat-native-1.2-1.1.0.xml
project/tomcat-tc7.xml project/tomcat-tc9.xml project/tomcat-trunk.xml
Author: markt
Date: Fri Feb 21 12:07:19 2020
New Revision: 1874315
URL: http://svn.apache.org/viewvc?rev=1874315&view=rev
Log:
Drop unsupported OpenSSL versions. Rename Tomcat 9. Add Tomcat 10.
Added:
gump/metadata/project/tomcat-tc9.xml (with props)
Removed:
gump/metadata/project/openssl-1.0.2.xml
gump/metadata/project/openssl-1.1.0.xml
gump/metadata/project/tomcat-native-1.2-1.0.2.xml
gump/metadata/project/tomcat-native-1.2-1.1.0.xml
Modified:
gump/metadata/profile/gump.xml
gump/metadata/project/tomcat-tc7.xml
gump/metadata/project/tomcat-trunk.xml
Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1874315&r1=1874314&r2=1874315&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Fri Feb 21 12:07:19 2020
@@ -65,9 +65,8 @@
<module href="project/tomcat-taglibs.xml"/>
<module href="project/tomcat-tc7.xml" />
<module href="project/tomcat-tc8.xml" />
+ <module href="project/tomcat-tc9.xml" />
<module href="project/tomcat-trunk.xml" />
- <module href="project/tomcat-native-1.2-1.0.2.xml"/>
- <module href="project/tomcat-native-1.2-1.1.0.xml"/>
<module href="project/tomcat-native-1.2-1.1.1.xml"/>
<module href="project/tomcat-native-trunk.xml"/>
@@ -98,8 +97,6 @@
<module href="project/objenesis.xml"/>
<module href="project/openssl.xml"/>
<module href="project/openssl-1.1.1.xml"/>
- <module href="project/openssl-1.1.0.xml"/>
- <module href="project/openssl-1.0.2.xml"/>
<module href="project/xz-java.xml"/>
<!-- Sun -->
Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1874315&r1=1874314&r2=1874315&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Fri Feb 21 12:07:19 2020
@@ -167,7 +167,7 @@
<property name="execute.test.apr" value="true"/>
<property name="execute.test.bio" value="false"/>
<property name="execute.test.nio" value="false"/>
- <property name="test.apr.loc" project="tomcat-native-1.2-1.0.2-make-install"
+ <property name="test.apr.loc" project="tomcat-native-1.2-1.1.1-make-install"
reference="home"/>
<property name="base.path" path="tomcat-build-libs"/>
<property name="test.relaxTiming" value="true"/>
Added: gump/metadata/project/tomcat-tc9.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc9.xml?rev=1874315&view=auto
==============================================================================
--- gump/metadata/project/tomcat-tc9.xml (added)
+++ gump/metadata/project/tomcat-tc9.xml Fri Feb 21 12:07:19 2020
@@ -0,0 +1,250 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+<module name="tomcat-trunk">
+
+ <description>
+ Tomcat 9.x, a web server implementing the Java Servlet 4.0,
+ Java Server Pages 2.4?, Unified Expression Language 3.1? &
+ Java WebSocket 1.2? specifications
+ </description>
+ <url href="http://tomcat.apache.org/index.html"/>
+
+ <git repository="asf-gitbox" dir="/tomcat.git" branch="9.0.x"/>
+
+ <project name="tomcat-trunk">
+ <package>org.apache.catalina</package>
+ <ant>
+ <depend property="jdt.jar" project="eclipse" id="jdtcore" />
+ <depend property="saaj-api.jar" project="saaj-api" id="saaj-api" />
+ <depend property="jaxrpc-lib.jar" project="jaxrpc" id="jaxrpc" />
+ <depend property="wsdl4j-lib.jar" project="wsdl4j" id="wsdl4j" />
+ <depend property="commons-daemon.jar" project="commons-daemon"
+ id="commons-daemon" />
+ <depend property="bnd.jar" project="bnd" id="bnd" />
+ <depend property="bndlib.jar" project="bnd" id="bndlib" />
+ <property name="junit.jar" project="junit" reference="jarpath" id="junit" />
+ <property name="base.path" path="tomcat-build-libs"/>
+ </ant>
+
+ <depend project="ant" inherit="runtime" />
+ <option project="junit" />
+ <!-- These option elements make both *-validate projects to run before
+ this project. Their result is not used here, so noclasspath. -->
+ <option project="tomcat-trunk-validate"><noclasspath/></option>
+ <option project="tomcat-trunk-validate-eoln"><noclasspath/></option>
+ <mkdir dir="tomcat-deps" />
+ <work nested="output/classes" />
+
+ <license name="LICENSE" />
+ <home nested="output/build" />
+ <jar name="bin/bootstrap.jar" id="bootstrap" />
+ <jar name="bin/tomcat-juli.jar" id="tomcat-juli" />
+ <jar name="lib/annotations-api.jar" id="annotations-api" />
+ <jar name="lib/servlet-api.jar" id="servlet-api" />
+ <jar name="lib/jsp-api.jar" id="jsp-api" />
+ <jar name="lib/el-api.jar" id="el-api" />
+ <jar name="lib/websocket-api.jar" id="websocket-api" />
+ <jar name="lib/jaspic-api.jar" id="jaspic-api"/>
+ <jar name="lib/catalina.jar" id="catalina" />
+ <jar name="lib/catalina-ant.jar" id="catalina-ant" />
+ <jar name="lib/catalina-ssi.jar" id="catalina-ssi" />
+ <jar name="lib/catalina-storeconfig.jar" id="catalina-storeconfig" />
+ <jar name="lib/tomcat-coyote.jar" id="tomcat-coyote" />
+ <jar name="lib/jasper.jar" id="jasper" />
+ <jar name="lib/jasper-el.jar" id="jasper-el" />
+ <jar name="lib/catalina-tribes.jar" id="catalina-tribes" />
+ <jar name="lib/catalina-ha.jar" id="catalina-ha" />
+ <jar name="lib/tomcat-api.jar" id="tomcat-api" />
+ <jar name="lib/tomcat-jni.jar" id="tomcat-jni" />
+ <jar name="lib/tomcat-util.jar" id="tomcat-util" />
+ <jar name="lib/tomcat-util-scan.jar" id="tomcat-util-scan" />
+ <jar name="lib/tomcat-websocket.jar" id="tomcat-websocket" />
+ <jar name="lib/tomcat-i18n-es.jar" id="tomcat-i18n-es" />
+ <jar name="lib/tomcat-i18n-fr.jar" id="tomcat-i18n-fr" />
+ <jar name="lib/tomcat-i18n-ja.jar" id="tomcat-i18n-ja" />
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+
+ <project name="tomcat-trunk-test-nio">
+ <package>org.apache.catalina</package>
+ <ant target="test">
+ <depend property="jdt.jar" project="eclipse" id="jdtcore" />
+ <depend property="saaj-api.jar" project="saaj-api" id="saaj-api" />
+ <depend property="jaxrpc-lib.jar" project="jaxrpc" id="jaxrpc" />
+ <depend property="wsdl4j-lib.jar" project="wsdl4j" id="wsdl4j" />
+ <depend property="commons-daemon.jar" project="commons-daemon"
+ id="commons-daemon" />
+ <depend property="bnd.jar" project="bnd" id="bnd" />
+ <depend property="bndlib.jar" project="bnd" id="bndlib" />
+ <depend property="junit.jar" project="junit" id="junit"/>
+ <depend property="hamcrest.jar" project="hamcrest-java"/>
+ <depend property="cglib.jar" project="cglib" id="cglib" />
+ <depend property="objenesis.jar" project="objenesis" id="objenesis" />
+ <depend property="easymock.jar" project="easymock" id="easymock" />
+ <property name="examples.sources.skip" value="true" />
+ <property name="test.temp" value="output/test-tmp-NIO" />
+ <property name="test.reports" value="output/logs-NIO" />
+ <property name="test.accesslog" value="true" />
+ <property name="test.excludePerformance" value="true" />
+ <property name="execute.test.apr" value="false"/>
+ <property name="execute.test.nio" value="true"/>
+ <property name="execute.test.nio2" value="false"/>
+ <property name="test.openssl.path" project="openssl-1.1.1-make-install"
+ id="openssl" reference="outputpath"/>
+ <property name="test.relaxTiming" value="true"/>
+ <property name="base.path" path="tomcat-build-libs"/>
+ <property name="java.net.preferIPv4Stack" path="true"/>
+ </ant>
+
+ <depend project="ant" inherit="runtime" />
+ <depend project="tomcat-trunk"/>
+
+ <work nested="output/build/webapps/examples/WEB-INF/classes"/>
+ <work nested="output/testclasses" />
+
+ <license name="LICENSE" />
+
+ <report nested="output/logs-NIO" />
+ <report nested="output/test-tmp-NIO/logs" />
+
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+ <project name="tomcat-trunk-test-nio2">
+ <package>org.apache.catalina</package>
+ <ant target="test">
+ <depend property="jdt.jar" project="eclipse" id="jdtcore" />
+ <depend property="saaj-api.jar" project="saaj-api" id="saaj-api" />
+ <depend property="jaxrpc-lib.jar" project="jaxrpc" id="jaxrpc" />
+ <depend property="wsdl4j-lib.jar" project="wsdl4j" id="wsdl4j" />
+ <depend property="commons-daemon.jar" project="commons-daemon"
+ id="commons-daemon" />
+ <depend property="bnd.jar" project="bnd" id="bnd" />
+ <depend property="bndlib.jar" project="bnd" id="bndlib" />
+ <depend property="junit.jar" project="junit" id="junit"/>
+ <depend property="hamcrest.jar" project="hamcrest-java"/>
+ <depend property="cglib.jar" project="cglib" id="cglib" />
+ <depend property="objenesis.jar" project="objenesis" id="objenesis" />
+ <depend property="easymock.jar" project="easymock" id="easymock" />
+ <property name="examples.sources.skip" value="true" />
+ <property name="test.accesslog" value="true" />
+ <property name="test.temp" value="output/test-tmp-NIO2" />
+ <property name="test.reports" value="output/logs-NIO2" />
+ <property name="test.excludePerformance" value="true" />
+ <property name="execute.test.apr" value="false"/>
+ <property name="execute.test.nio" value="false"/>
+ <property name="execute.test.nio2" value="true"/>
+ <property name="test.openssl.path" project="openssl-1.1.1-make-install"
+ id="openssl" reference="outputpath"/>
+ <property name="test.relaxTiming" value="true"/>
+ <property name="base.path" path="tomcat-build-libs"/>
+ <property name="java.net.preferIPv4Stack" path="true"/>
+ </ant>
+
+ <depend project="ant" inherit="runtime" />
+ <depend project="tomcat-trunk"/>
+
+ <work nested="output/build/webapps/examples/WEB-INF/classes"/>
+ <work nested="output/testclasses" />
+
+ <license name="LICENSE" />
+
+ <report nested="output/logs-NIO2" />
+ <report nested="output/test-tmp-NIO2/logs" />
+
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+ <project name="tomcat-trunk-test-apr">
+ <package>org.apache.catalina</package>
+ <ant target="test">
+ <depend property="jdt.jar" project="eclipse" id="jdtcore" />
+ <depend property="saaj-api.jar" project="saaj-api" id="saaj-api" />
+ <depend property="jaxrpc-lib.jar" project="jaxrpc" id="jaxrpc" />
+ <depend property="wsdl4j-lib.jar" project="wsdl4j" id="wsdl4j" />
+ <depend property="commons-daemon.jar" project="commons-daemon"
+ id="commons-daemon" />
+ <depend property="bnd.jar" project="bnd" id="bnd" />
+ <depend property="bndlib.jar" project="bnd" id="bndlib" />
+ <depend property="junit.jar" project="junit" id="junit"/>
+ <depend property="hamcrest.jar" project="hamcrest-java"/>
+ <depend property="cglib.jar" project="cglib" id="cglib" />
+ <depend property="objenesis.jar" project="objenesis" id="objenesis" />
+ <depend property="easymock.jar" project="easymock" id="easymock" />
+ <property name="examples.sources.skip" value="true" />
+ <property name="test.accesslog" value="true" />
+ <property name="test.temp" value="output/test-tmp-APR" />
+ <property name="test.reports" value="output/logs-APR" />
+ <property name="test.excludePerformance" value="true" />
+ <property name="execute.test.apr" value="true"/>
+ <property name="execute.test.nio" value="false"/>
+ <property name="execute.test.nio2" value="false"/>
+ <property name="test.openssl.path" project="openssl-1-1-1-make-install"
+ id="openssl" reference="outputpath"/>
+ <property name="test.apr.loc" project="tomcat-native-1.2-1.1.1-make-install"
+ reference="home"/>
+ <property name="test.relaxTiming" value="true"/>
+ <property name="base.path" path="tomcat-build-libs"/>
+ <property name="java.net.preferIPv4Stack" path="true"/>
+ </ant>
+
+ <depend project="ant" inherit="runtime" />
+ <depend project="tomcat-trunk"/>
+
+ <work nested="output/build/webapps/examples/WEB-INF/classes"/>
+ <work nested="output/testclasses" />
+
+ <license name="LICENSE" />
+
+ <report nested="output/logs-APR" />
+ <report nested="output/test-tmp-APR/logs" />
+
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+
+ <project name="tomcat-trunk-validate">
+ <package>org.apache.catalina</package>
+ <ant target="validate">
+ <property name="checkstyle.jar" project="checkstyle"
+ reference="jarpath" id="checkstyle" />
+ <property name="execute.validate" value="true" />
+ <property name="base.path" path="tomcat-build-libs"/>
+ </ant>
+
+ <depend project="ant" inherit="runtime" />
+ <depend project="checkstyle" inherit="runtime"/>
+
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+
+ <project name="tomcat-trunk-validate-eoln">
+ <package>org.apache.catalina</package>
+ <ant target="validate-eoln" />
+ <depend project="ant" inherit="runtime" />
+ <!-- classes have to be on the classpath so that taskdef
+ in build.xml finds the class -->
+ <work nested="output/classes" />
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+</module>
Propchange: gump/metadata/project/tomcat-tc9.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1874315&r1=1874314&r2=1874315&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Fri Feb 21 12:07:19 2020
@@ -20,9 +20,9 @@
<module name="tomcat-trunk">
<description>
- Tomcat 9.x, a web server implementing the Java Servlet 4.0,
- Java Server Pages 2.4?, Unified Expression Language 3.1? &
- Java WebSocket 1.2? specifications
+ Tomcat 10.x, a web server implementing the Jakarta Servlet 5.0,
+ Jakarta Server Pages 3.0, Jakarta Expression Language 4.0 &
+ Jakarta WebSocket 2.0 specifications
</description>
<url href="http://tomcat.apache.org/index.html"/>