[java-idp-integration-tests] 02/02: Bump Tomcat to 8.5.34

[Tom Zeller]

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=e7c9534484454aa046d2c5c8c712c454d183668e

commit e7c9534484454aa046d2c5c8c712c454d183668e
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Oct 22 11:56:38 2018 -0500

    Bump Tomcat to 8.5.34
---
 pom.xml | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c1a989..e0078b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
         <jetty.version>9.4.12.v20180830</jetty.version>
 
         <!-- Tomcat -->
-        <idp-tomcat-base.version>8.0.0-SNAPSHOT</idp-tomcat-base.version>
-        <tomcat.version>8.0.50</tomcat.version>
+        <idp-tomcat-base.version>8.5.0-SNAPSHOT</idp-tomcat-base.version>
+        <tomcat.version>8.5.34</tomcat.version>
 
         <!-- Testbed -->
         <testbed.version>0.8.0-SNAPSHOT</testbed.version>
@@ -456,6 +456,18 @@
         </profile>
 
         <!--
+        Tomcat 8.5.34
+        -->
+        <profile>
+            <id>tomcat-8.5.34</id>
+            <properties>
+                <idp-tomcat-base.version>8.5.0-SNAPSHOT</idp-tomcat-base.version>
+                <tomcat.version>8.5.34</tomcat.version>
+            </properties>
+        </profile>
+
+
+        <!--
         The jetty profile unpacks Jetty, idp-jetty-base, and adds the testbed to Jetty.
         The jetty profile is active by default and not active if the 'tomcat' system property is present.
         -->
@@ -650,23 +662,6 @@
                 </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>
 
         <!--
         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.