[java-idp-integration-tests] 04/04: Move properties out of profiles.

[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=9d58259b651b6fedba50561d92e7138814055e40

commit 9d58259b651b6fedba50561d92e7138814055e40
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Fri Dec 1 00:07:55 2017 -0600

    Move properties out of profiles.
    
    Colocate the properties which define the versions of the IdP and Jetty
    to be tested.
    
    Scott's suggestion.
---
 pom.xml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c2688e..9bda7dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,14 @@
         <java-support.version>7.4.0-SNAPSHOT</java-support.version>
         <opensaml.version>3.4.0-SNAPSHOT</opensaml.version>
         <idp.version>3.4.0-SNAPSHOT</idp.version>
+        <idp-current.version>3.3.2</idp-current.version>
+        <idp-next-patch.version>3.3.3-SNAPSHOT</idp-next-patch.version>
+        <idp-jetty-base-current.version>9.3.0</idp-jetty-base-current.version>
+        <idp-jetty-base-next.version>9.3.0</idp-jetty-base-next.version>
+        <idp-jetty-base-future.version>9.4.0-SNAPSHOT</idp-jetty-base-future.version>
+        <jetty-current.version>9.3.9.v20160517</jetty-current.version>
+        <jetty-next.version>9.3.21.v20170918</jetty-next.version>
+        <jetty-future.version>9.4.7.v20170914</jetty-future.version>
         <selenium.version>2.53.1</selenium.version>
         <testbed.version>0.7.0-SNAPSHOT</testbed.version>
         <testbed.classifier>classes</testbed.classifier>
@@ -381,7 +389,7 @@
         <profile>
             <id>idp-current</id>
             <properties>
-                 <idp.version>3.3.2</idp.version>
+                 <idp.version>${idp-current.version}</idp.version>
             </properties>
         </profile>
         <!--
@@ -390,7 +398,7 @@
         <profile>
             <id>idp-next-patch</id>
             <properties>
-                <idp.version>3.3.3-SNAPSHOT</idp.version>
+                <idp.version>${idp-next-patch.version}</idp.version>
             </properties>
         </profile>
         <!--
@@ -518,8 +526,8 @@
                 </property>
             </activation>
             <properties>
-                <idp-jetty-base.version>9.3.0</idp-jetty-base.version>
-                <jetty.version>9.3.9.v20160517</jetty.version>
+                <idp-jetty-base.version>${idp-jetty-base-current.version}</idp-jetty-base.version>
+                <jetty.version>${jetty-current.version}</jetty.version>
             </properties>
         </profile>
         <!--
@@ -529,8 +537,8 @@
         <profile>
             <id>jetty-next</id>
             <properties>
-                <idp-jetty-base.version>9.3.0</idp-jetty-base.version>
-                <jetty.version>9.3.21.v20170918</jetty.version>
+                <idp-jetty-base.version>${idp-jetty-base-next.version}</idp-jetty-base.version>
+                <jetty.version>${jetty-next.version}</jetty.version>
             </properties>
         </profile>
         <!--
@@ -540,8 +548,8 @@
         <profile>
             <id>jetty-future</id>
             <properties>
-                <idp-jetty-base.version>9.4.0-SNAPSHOT</idp-jetty-base.version>
-                <jetty.version>9.4.7.v20170914</jetty.version>
+                <idp-jetty-base.version>${idp-jetty-base-future.version}</idp-jetty-base.version>
+                <jetty.version>${jetty-future.version}</jetty.version>
             </properties>
         </profile>
         <!-- The jetty-snapshots profile enables Jetty snapshot dependencies. -->

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