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 2022/11/10 15:48:53 UTC

svn commit: r1905224 - /gump/metadata/project/tomcat-10.1.x.xml

Author: markt
Date: Thu Nov 10 15:48:52 2022
New Revision: 1905224

URL: http://svn.apache.org/viewvc?rev=1905224&view=rev
Log:
More updates for Tomcat 10.1.x

Modified:
    gump/metadata/project/tomcat-10.1.x.xml

Modified: gump/metadata/project/tomcat-10.1.x.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-10.1.x.xml?rev=1905224&r1=1905223&r2=1905224&view=diff
==============================================================================
--- gump/metadata/project/tomcat-10.1.x.xml (original)
+++ gump/metadata/project/tomcat-10.1.x.xml Thu Nov 10 15:48:52 2022
@@ -63,6 +63,7 @@
     <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/websocket-client-api.jar" id="websocket-client-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" />
@@ -114,9 +115,10 @@
       <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.apr.loc" project="tomcat-native-trunk-make-install"
+                reference="home"/>
       <property name="test.openssl.path" project="openssl-make-install" 
                 id="openssl" reference="outputpath"/>
       <property name="test.relaxTiming" value="true"/>
@@ -163,9 +165,10 @@
       <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.apr.loc" project="tomcat-native-trunk-make-install"
+                reference="home"/>
       <property name="test.openssl.path" project="openssl-make-install" 
                 id="openssl" reference="outputpath"/>
       <property name="test.relaxTiming" value="true"/>
@@ -186,57 +189,6 @@
 
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
- </project>
- <project name="tomcat-10.1.x-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="migration-lib.jar" project="tomcat-migration" 
-              id="migration-shaded" />
-      <depend property="bnd.jar" project="bnd" id="bnd" />
-      <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" />
-      <depend property="unboundid.jar" project="unboundid"  id="unboundid-ldapsdk" />
-      <depend property="jacocoant.jar" project="jacoco" id="jacocoant" />
-      <property name="examples.sources.skip" value="true" />
-      <property name="test.threads" value="2" />
-      <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-make-install" 
-                id="openssl" reference="outputpath"/>
-      <property name="test.apr.loc" project="tomcat-native-1.2-3.0.x-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-10.1.x"/>
-
-   <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 &lt;billbarker@apache.org&gt;" />
  </project>
 
  <project name="tomcat-10.1.x-validate">