[java-idp-integration-tests] 01/02: Add tomcat-current, tomcat-next, and tomcat-future profiles

Tom Zeller tzeller at dragonacea.biz
Sat Mar 24 17:02:01 EDT 2018


This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch master
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=738fe0ffa50e3eed5efbf8c03f77f277dff70dc2

commit 738fe0ffa50e3eed5efbf8c03f77f277dff70dc2
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Sat Mar 24 16:00:10 2018 -0500

    Add tomcat-current, tomcat-next, and tomcat-future profiles
---
 pom.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 62713bd..6e612ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,12 @@
         <xmlresolver.groupId>xml-resolver</xmlresolver.groupId>
         <xmlresolver.version>1.2</xmlresolver.version>
         <sauce.version>2.1.20</sauce.version>
+        <idp-tomcat-base-current.version>8.0.0-SNAPSHOT</idp-tomcat-base-current.version>
+        <idp-tomcat-base-next.version>8.5.0-SNAPSHOT</idp-tomcat-base-next.version>
+        <idp-tomcat-base-future.version>9.0.0-SNAPSHOT</idp-tomcat-base-future.version>
+        <tomcat-current.version>8.0.50</tomcat-current.version>
+        <tomcat-next.version>8.5.29</tomcat-next.version>
+        <tomcat-future.version>9.0.6</tomcat-future.version>
     </properties>
 
     <repositories>
@@ -574,10 +580,6 @@
                     <name>tomcat</name>
                 </property>
             </activation>
-            <properties>
-                <idp-tomcat-base.version>8.0.0-SNAPSHOT</idp-tomcat-base.version>
-                <tomcat.version>8.0.36</tomcat.version>
-            </properties>
             <dependencies>
                 <dependency>
                     <groupId>net.shibboleth.idp</groupId>
@@ -657,6 +659,45 @@
                 </plugins>
             </build>
         </profile>
+        <!--
+        The tomcat-current profile sets the versions of Tomcat and tomcat-base to the versions included
+        in the current release of the IdP.
+        The tomcat-current profile is active if the 'tomcat' system property is present.
+        -->
+        <profile>
+            <id>tomcat-current</id>
+            <activation>
+                <property>
+                    <name>tomcat</name>
+                </property>
+            </activation>
+            <properties>
+                <idp-tomcat-base.version>${idp-tomcat-base-current.version}</idp-tomcat-base.version>
+                <tomcat.version>${tomcat-current.version}</tomcat.version>
+            </properties>
+        </profile>
+        <!--
+        The tomcat-next profile sets the versions of Tomcat and tomcat-base to the versions to be included
+        in the next release of the IdP.
+        -->
+        <profile>
+            <id>tomcat-next</id>
+            <properties>
+                <idp-tomcat-base.version>${idp-tomcat-base-next.version}</idp-tomcat-base.version>
+                <tomcat.version>${tomcat-next.version}</tomcat.version>
+            </properties>
+        </profile>
+        <!--
+        The tomcat-future profile sets the versions of Tomcat and tomcat-base to the versions to be included
+        in a future release of the IdP.
+        -->
+        <profile>
+            <id>tomcat-future</id>
+            <properties>
+                <idp-tomcat-base.version>${idp-tomcat-base-future.version}</idp-tomcat-base.version>
+                <tomcat.version>${tomcat-future.version}</tomcat.version>
+            </properties>
+        </profile>
 
         <!--
         Remove the testbed dependency classifier when using Eclipse, but not from the command line.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list