gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1842621 - in /gump/metadata: profile/gump.xml project/tomcat-native-1.2-1.0.2.xml project/tomcat-native-1.2-1.1.0.xml project/tomcat-native-1.2-1.1.1.xml project/tomcat-native-12.xml project/tomcat-tc7.xml project/tomcat-tc8.xml
Date Tue, 02 Oct 2018 14:13:35 GMT
Author: markt
Date: Tue Oct  2 14:13:34 2018
New Revision: 1842621

URL: http://svn.apache.org/viewvc?rev=1842621&view=rev
Log:
Add additional tomcat-native builds with different OpenSSL versions and reconfigure which
tomcat-native versions are tested with which major Tomcat version

Added:
    gump/metadata/project/tomcat-native-1.2-1.0.2.xml
      - copied, changed from r1842620, gump/metadata/project/tomcat-native-12.xml
    gump/metadata/project/tomcat-native-1.2-1.1.0.xml   (with props)
    gump/metadata/project/tomcat-native-1.2-1.1.1.xml   (with props)
Removed:
    gump/metadata/project/tomcat-native-12.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/tomcat-tc7.xml
    gump/metadata/project/tomcat-tc8.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1842621&r1=1842620&r2=1842621&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Tue Oct  2 14:13:34 2018
@@ -83,7 +83,9 @@
   <module href="project/tomcat-tc7.xml" />
   <module href="project/tomcat-tc8.xml" />
   <module href="project/tomcat-trunk.xml" />
-  <module href="project/tomcat-native-12.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"/>
 
 <!-- Apache.XML -->

Copied: gump/metadata/project/tomcat-native-1.2-1.0.2.xml (from r1842620, gump/metadata/project/tomcat-native-12.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-native-1.2-1.0.2.xml?p2=gump/metadata/project/tomcat-native-1.2-1.0.2.xml&p1=gump/metadata/project/tomcat-native-12.xml&r1=1842620&r2=1842621&rev=1842621&view=diff
==============================================================================
--- gump/metadata/project/tomcat-native-12.xml (original)
+++ gump/metadata/project/tomcat-native-1.2-1.0.2.xml Tue Oct  2 14:13:34 2018
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="tomcat-native-12">
+<module name="tomcat-native-1.2-1.0.2">
 
   <url href="http://tomcat.apache.org/"/>
   <description>
@@ -24,7 +24,7 @@
 
   <svn repository="asf" dir="tomcat/native/trunk"/>
 
-  <project name="tomcat-native-12-buildconf">
+  <project name="tomcat-native-1.2-1.0.2-buildconf">
     <script name="buildconf" basedir="native">
      <arg name="--with-apr" project="apr-1-configure" reference="srcdir"/>
     </script>
@@ -33,14 +33,14 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>
 
-  <project name="tomcat-native-12-configure">
+  <project name="tomcat-native-1.2-1.0.2-configure">
     <mkdir dir="dest-@@DATE@@"/>
     <configure basedir="native">
       <arg name="--prefix" path="dest-@@DATE@@"/>
       <arg name="--with-apr" project="apr-1-configure" reference="home"/>
       <arg name="--with-ssl" project="openssl-1.0.2-configure" reference="home"/>
     </configure>
-    <depend project="tomcat-native-12-buildconf"/>
+    <depend project="tomcat-native-1.2-1.0.2-buildconf"/>
     <depend project="apr-1-make-install"/>
     <depend project="openssl-1.0.2-make-install"/>
     <home nested="dest-@@DATE@@"/>
@@ -48,16 +48,16 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>
 
-  <project name="tomcat-native-12-make">
+  <project name="tomcat-native-1.2-1.0.2-make">
     <make basedir="native"/>
-    <depend project="tomcat-native-12-configure"/>
+    <depend project="tomcat-native-1.2-1.0.2-configure"/>
     <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>
 
-  <project name="tomcat-native-12-make-install">
+  <project name="tomcat-native-1.2-1.0.2-make-install">
     <make target="install" basedir="native"/>
-    <depend project="tomcat-native-12-make"/>
+    <depend project="tomcat-native-1.2-1.0.2-make"/>
     <home nested="dest-@@DATE@@/lib"/>
     <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />

Added: gump/metadata/project/tomcat-native-1.2-1.1.0.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-native-1.2-1.1.0.xml?rev=1842621&view=auto
==============================================================================
--- gump/metadata/project/tomcat-native-1.2-1.1.0.xml (added)
+++ gump/metadata/project/tomcat-native-1.2-1.1.0.xml Tue Oct  2 14:13:34 2018
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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-native-1.2-1.1.0">
+
+  <url href="http://tomcat.apache.org/"/>
+  <description>
+    Tomcat native library using Apache Portable Runtime
+  </description>
+
+  <svn repository="asf" dir="tomcat/native/trunk"/>
+
+  <project name="tomcat-native-1.2-1.1.0-buildconf">
+    <script name="buildconf" basedir="native">
+     <arg name="--with-apr" project="apr-1-configure" reference="srcdir"/>
+    </script>
+    <depend project="apr-1-configure"/>
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+
+  <project name="tomcat-native-1.2-1.1.0-configure">
+    <mkdir dir="dest-@@DATE@@"/>
+    <configure basedir="native">
+      <arg name="--prefix" path="dest-@@DATE@@"/>
+      <arg name="--with-apr" project="apr-1-configure" reference="home"/>
+      <arg name="--with-ssl" project="openssl-1.1.0-configure" reference="home"/>
+    </configure>
+    <depend project="tomcat-native-1.2-1.1.0-buildconf"/>
+    <depend project="apr-1-make-install"/>
+    <depend project="openssl-1.0.2-make-install"/>
+    <home nested="dest-@@DATE@@"/>
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+
+  <project name="tomcat-native-1.2-1.1.0-make">
+    <make basedir="native"/>
+    <depend project="tomcat-native-1.2-1.1.0-configure"/>
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+
+  <project name="tomcat-native-1.2-1.1.0-make-install">
+    <make target="install" basedir="native"/>
+    <depend project="tomcat-native-1.2-1.1.0-make"/>
+    <home nested="dest-@@DATE@@/lib"/>
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+</module>
+

Propchange: gump/metadata/project/tomcat-native-1.2-1.1.0.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: gump/metadata/project/tomcat-native-1.2-1.1.1.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-native-1.2-1.1.1.xml?rev=1842621&view=auto
==============================================================================
--- gump/metadata/project/tomcat-native-1.2-1.1.1.xml (added)
+++ gump/metadata/project/tomcat-native-1.2-1.1.1.xml Tue Oct  2 14:13:34 2018
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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-native-1.2-1.1.1">
+
+  <url href="http://tomcat.apache.org/"/>
+  <description>
+    Tomcat native library using Apache Portable Runtime
+  </description>
+
+  <svn repository="asf" dir="tomcat/native/trunk"/>
+
+  <project name="tomcat-native-1.2-1.1.1-buildconf">
+    <script name="buildconf" basedir="native">
+     <arg name="--with-apr" project="apr-1-configure" reference="srcdir"/>
+    </script>
+    <depend project="apr-1-configure"/>
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+
+  <project name="tomcat-native-1.2-1.1.1-configure">
+    <mkdir dir="dest-@@DATE@@"/>
+    <configure basedir="native">
+      <arg name="--prefix" path="dest-@@DATE@@"/>
+      <arg name="--with-apr" project="apr-1-configure" reference="home"/>
+      <arg name="--with-ssl" project="openssl-1.1.1-configure" reference="home"/>
+    </configure>
+    <depend project="tomcat-native-1.2-1.1.1-buildconf"/>
+    <depend project="apr-1-make-install"/>
+    <depend project="openssl-1.0.2-make-install"/>
+    <home nested="dest-@@DATE@@"/>
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+
+  <project name="tomcat-native-1.2-1.1.1-make">
+    <make basedir="native"/>
+    <depend project="tomcat-native-1.2-1.1.1-configure"/>
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+
+  <project name="tomcat-native-1.2-1.1.1-make-install">
+    <make target="install" basedir="native"/>
+    <depend project="tomcat-native-1.2-1.1.1-make"/>
+    <home nested="dest-@@DATE@@/lib"/>
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+</module>
+

Propchange: gump/metadata/project/tomcat-native-1.2-1.1.1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1842621&r1=1842620&r2=1842621&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Tue Oct  2 14:13:34 2018
@@ -228,7 +228,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-12-make-install"
+      <property name="test.apr.loc" project="tomcat-native-1.2-1.0.2-make-install"
                 reference="home"/>
       <property name="base.path" path="tomcat-build-libs"/>
       <property name="test.relaxTiming" value="true"/>

Modified: gump/metadata/project/tomcat-tc8.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc8.xml?rev=1842621&r1=1842620&r2=1842621&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc8.xml (original)
+++ gump/metadata/project/tomcat-tc8.xml Tue Oct  2 14:13:34 2018
@@ -97,8 +97,8 @@
       <property name="execute.test.bio" value="false"/>
       <property name="execute.test.nio" value="true"/>
       <property name="execute.test.nio2" value="false"/>
-      <property name="test.openssl.path" project="openssl-1.0.2-make-install" 
-                id="openssl-1.0.2" reference="outputpath"/>
+      <property name="test.openssl.path" project="openssl-1.1.1-make-install" 
+                id="openssl-1.1.1" reference="outputpath"/>
       <property name="base.path" path="tomcat-build-libs"/>
       <property name="test.relaxTiming" value="true"/>
       <property name="java.net.preferIPv4Stack" path="true"/>
@@ -138,8 +138,8 @@
       <property name="execute.test.bio" value="false"/>
       <property name="execute.test.nio" value="false"/>
       <property name="execute.test.nio2" value="true"/>
-      <property name="test.openssl.path" project="openssl-1.0.2-make-install" 
-                id="openssl-1.0.2" reference="outputpath"/>
+      <property name="test.openssl.path" project="openssl-1.1.1-make-install" 
+                id="openssl-1.1.1" reference="outputpath"/>
       <property name="base.path" path="tomcat-build-libs"/>
       <property name="test.relaxTiming" value="true"/>
       <property name="java.net.preferIPv4Stack" path="true"/>
@@ -179,9 +179,9 @@
       <property name="execute.test.bio" value="false"/>
       <property name="execute.test.nio" value="false"/>
       <property name="execute.test.nio2" value="false"/>
-      <property name="test.openssl.path" project="openssl-1.0.2-make-install" 
-                id="openssl-1.0.2" reference="outputpath"/>
-      <property name="test.apr.loc" project="tomcat-native-12-make-install"
+      <property name="test.openssl.path" project="openssl-1.1.1-make-install" 
+                id="openssl-1.1.1" reference="outputpath"/>
+      <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"/>



Mime
View raw message