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 2021/05/24 09:16:11 UTC

svn commit: r1890152 - in /gump/metadata: profile/ project/

Author: markt
Date: Mon May 24 09:16:10 2021
New Revision: 1890152

URL: http://svn.apache.org/viewvc?rev=1890152&view=rev
Log:
Update for new Tomcat 10.1.x development branch

Added:
    gump/metadata/project/tomcat-10.0.x.xml
      - copied, changed from r1890094, gump/metadata/project/tomcat-trunk.xml
    gump/metadata/project/tomcat-7.0.x.xml
      - copied unchanged from r1890151, gump/metadata/project/tomcat-tc7.xml
    gump/metadata/project/tomcat-8.5.x.xml
      - copied unchanged from r1890151, gump/metadata/project/tomcat-tc8.xml
    gump/metadata/project/tomcat-9.0.x.xml
      - copied unchanged from r1890151, gump/metadata/project/tomcat-tc9.xml
    gump/metadata/project/tomcat-main.xml
      - copied, changed from r1890151, gump/metadata/project/tomcat-trunk.xml
Removed:
    gump/metadata/project/tomcat-tc7.xml
    gump/metadata/project/tomcat-tc8.xml
    gump/metadata/project/tomcat-tc9.xml
    gump/metadata/project/tomcat-trunk.xml
Modified:
    gump/metadata/profile/gump.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1890152&r1=1890151&r2=1890152&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Mon May 24 09:16:10 2021
@@ -65,10 +65,11 @@
   <module href="project/tomcat-connectors-native.xml" />
   <module href="project/tomcat-taglibs.xml"/>
   <module href="project/tomcat-taglibs-parent.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-7.0.x.xml" />
+  <module href="project/tomcat-8.5.x.xml" />
+  <module href="project/tomcat-9.0.x.xml" />
+  <module href="project/tomcat-10.0.x.xml" />
+  <module href="project/tomcat-main.xml" />
   <module href="project/tomcat-native-1.2-1.1.1.xml"/>
   <module href="project/tomcat-native-trunk.xml"/>
   <module href="project/tomcat-migration.xml" />

Copied: gump/metadata/project/tomcat-10.0.x.xml (from r1890094, gump/metadata/project/tomcat-trunk.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-10.0.x.xml?p2=gump/metadata/project/tomcat-10.0.x.xml&p1=gump/metadata/project/tomcat-trunk.xml&r1=1890094&r2=1890152&rev=1890152&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-10.0.x.xml Mon May 24 09:16:10 2021
@@ -17,10 +17,10 @@
 -->
 
 
-<module name="tomcat-trunk">
+<module name="tomcat-10.0.x">
 
   <description>
-    Tomcat 10.x, a web server implementing the Jakarta Servlet 5.0,
+    Tomcat 10.0.x, a web server implementing the Jakarta Servlet 5.0,
     Jakarta Server Pages 3.0, Jakarta Expression Language 4.0 &amp; 
     Jakarta WebSocket 2.0 specifications
   </description>
@@ -28,7 +28,7 @@
 
   <git repository="asf-gitbox" dir="/tomcat.git" branch="main"/>
 
-  <project name="tomcat-trunk">
+  <project name="tomcat-10.0.x">
     <package>org.apache.catalina</package>
     <ant>
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -48,8 +48,8 @@
     <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>
+    <option project="tomcat-10.0.x-validate"><noclasspath/></option>
+    <option project="tomcat-10.0.x-validate-eoln"><noclasspath/></option>
     <mkdir dir="tomcat-deps" />
     <work nested="output/classes" />
 
@@ -88,7 +88,7 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>
 
- <project name="tomcat-trunk-test-nio">
+ <project name="tomcat-10.0.x-test-nio">
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -121,7 +121,7 @@
     </ant>
 
    <depend project="ant" inherit="runtime" />
-   <depend project="tomcat-trunk"/>
+   <depend project="tomcat-10.0.x"/>
 
    <work nested="output/build/webapps/examples/WEB-INF/classes"/>
    <work nested="output/testclasses" />
@@ -134,7 +134,7 @@
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
- <project name="tomcat-trunk-test-nio2">
+ <project name="tomcat-10.0.x-test-nio2">
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -167,7 +167,7 @@
     </ant>
 
    <depend project="ant" inherit="runtime" />
-   <depend project="tomcat-trunk"/>
+   <depend project="tomcat-10.0.x"/>
 
    <work nested="output/build/webapps/examples/WEB-INF/classes"/>
    <work nested="output/testclasses" />
@@ -180,7 +180,7 @@
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
- <project name="tomcat-trunk-test-apr">
+ <project name="tomcat-10.0.x-test-apr">
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -215,7 +215,7 @@
     </ant>
 
    <depend project="ant" inherit="runtime" />
-   <depend project="tomcat-trunk"/>
+   <depend project="tomcat-10.0.x"/>
 
    <work nested="output/build/webapps/examples/WEB-INF/classes"/>
    <work nested="output/testclasses" />
@@ -229,7 +229,7 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
 
- <project name="tomcat-trunk-validate">
+ <project name="tomcat-10.0.x-validate">
    <package>org.apache.catalina</package>
    <ant target="validate">
       <property name="checkstyle.jar" project="checkstyle"
@@ -245,7 +245,7 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
 
-  <project name="tomcat-trunk-validate-eoln">
+  <project name="tomcat-10.0.x-validate-eoln">
     <package>org.apache.catalina</package>
     <ant target="validate-eoln" />
     <depend project="ant" inherit="runtime" />

Copied: gump/metadata/project/tomcat-main.xml (from r1890151, gump/metadata/project/tomcat-trunk.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-main.xml?p2=gump/metadata/project/tomcat-main.xml&p1=gump/metadata/project/tomcat-trunk.xml&r1=1890151&r2=1890152&rev=1890152&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-main.xml Mon May 24 09:16:10 2021
@@ -17,10 +17,10 @@
 -->
 
 
-<module name="tomcat-trunk">
+<module name="tomcat-main">
 
   <description>
-    Tomcat 10.x, a web server implementing the Jakarta Servlet 5.0,
+    Tomcat 10.1.x, a web server implementing the Jakarta Servlet 5.0,
     Jakarta Server Pages 3.0, Jakarta Expression Language 4.0 &amp; 
     Jakarta WebSocket 2.0 specifications
   </description>
@@ -28,7 +28,7 @@
 
   <git repository="asf-gitbox" dir="/tomcat.git" branch="main"/>
 
-  <project name="tomcat-trunk">
+  <project name="tomcat-main">
     <package>org.apache.catalina</package>
     <ant>
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -48,8 +48,8 @@
     <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>
+    <option project="tomcat-main-validate"><noclasspath/></option>
+    <option project="tomcat-main-validate-eoln"><noclasspath/></option>
     <mkdir dir="tomcat-deps" />
     <work nested="output/classes" />
 
@@ -88,7 +88,7 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>
 
- <project name="tomcat-trunk-test-nio">
+ <project name="tomcat-main-test-nio">
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -121,7 +121,7 @@
     </ant>
 
    <depend project="ant" inherit="runtime" />
-   <depend project="tomcat-trunk"/>
+   <depend project="tomcat-main"/>
 
    <work nested="output/build/webapps/examples/WEB-INF/classes"/>
    <work nested="output/testclasses" />
@@ -134,7 +134,7 @@
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
- <project name="tomcat-trunk-test-nio2">
+ <project name="tomcat-main-test-nio2">
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -167,7 +167,7 @@
     </ant>
 
    <depend project="ant" inherit="runtime" />
-   <depend project="tomcat-trunk"/>
+   <depend project="tomcat-main"/>
 
    <work nested="output/build/webapps/examples/WEB-INF/classes"/>
    <work nested="output/testclasses" />
@@ -180,7 +180,7 @@
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
- <project name="tomcat-trunk-test-apr">
+ <project name="tomcat-main-test-apr">
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -215,7 +215,7 @@
     </ant>
 
    <depend project="ant" inherit="runtime" />
-   <depend project="tomcat-trunk"/>
+   <depend project="tomcat-main"/>
 
    <work nested="output/build/webapps/examples/WEB-INF/classes"/>
    <work nested="output/testclasses" />
@@ -229,7 +229,7 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
 
- <project name="tomcat-trunk-validate">
+ <project name="tomcat-main-validate">
    <package>org.apache.catalina</package>
    <ant target="validate">
       <property name="checkstyle.jar" project="checkstyle"
@@ -245,7 +245,7 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
 
-  <project name="tomcat-trunk-validate-eoln">
+  <project name="tomcat-main-validate-eoln">
     <package>org.apache.catalina</package>
     <ant target="validate-eoln" />
     <depend project="ant" inherit="runtime" />