[java-idp-integration-tests] branch master updated: More use of profiles to test Jetty.
Tom Zeller
tzeller at dragonacea.biz
Wed Nov 15 12:39:36 EST 2017
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=6ad5660e3687d2c59420505b6a36be53186e47c1
The following commit(s) were added to refs/heads/master by this push:
new 6ad5660 More use of profiles to test Jetty.
6ad5660 is described below
commit 6ad5660e3687d2c59420505b6a36be53186e47c1
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Nov 15 11:38:40 2017 -0600
More use of profiles to test Jetty.
Add jetty-current, jetty-next, and jetty-future profiles to test the
versions of Jetty included in the current, next, and future releases of
the IdP for Windows.
Move Jetty properties and dependencies to profiles.
Exclude all transitive dependencies of jetty-distribution.
---
pom.xml | 90 +++++++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 57 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9cfaf5b..b48f834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,9 +20,7 @@
<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-jetty-base.version>9.3.1-SNAPSHOT</idp-jetty-base.version>
<idp-tomcat-base.version>8.0.0-SNAPSHOT</idp-tomcat-base.version>
- <jetty.version>9.3.16.v20170120</jetty.version>
<selenium.version>2.53.1</selenium.version>
<testbed.version>0.7.0-SNAPSHOT</testbed.version>
<testbed.classifier>classes</testbed.classifier>
@@ -113,13 +111,6 @@
</dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-jetty-base</artifactId>
- <version>${idp-jetty-base.version}</version>
- <scope>test</scope>
- <type>tar.gz</type>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.idp</groupId>
<artifactId>idp-testbed</artifactId>
<version>${testbed.version}</version>
<scope>test</scope>
@@ -152,27 +143,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-distribution</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- <type>zip</type>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>test-jetty-webapp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>test-proxy-webapp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>3.0.0</version>
@@ -477,6 +447,28 @@
<name>!tomcat</name>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-jetty-base</artifactId>
+ <version>${idp-jetty-base.version}</version>
+ <scope>test</scope>
+ <type>tar.gz</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-distribution</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ <type>zip</type>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -547,12 +539,44 @@
</plugins>
</build>
</profile>
- <!-- The jetty-9.4 profile sets the version of Jetty and our jetty-base project. -->
+ <!--
+ The jetty-current profile sets the versions of Jetty and jetty-base to the versions included
+ in the current release of the IdP.
+ The jetty-current profile is active by default and not active if the 'tomcat' system property is present.
+ -->
+ <profile>
+ <id>jetty-current</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!tomcat</name>
+ </property>
+ </activation>
+ <properties>
+ <idp-jetty-base.version>9.3.0</idp-jetty-base.version>
+ <jetty.version>9.3.9.v20160517</jetty.version>
+ </properties>
+ </profile>
+ <!--
+ The jetty-next profile sets the versions of Jetty and jetty-base to the versions to be included
+ in the next release of the IdP.
+ -->
+ <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>
+ </properties>
+ </profile>
+ <!--
+ The jetty-future profile sets the versions of Jetty and jetty-base to the versions to be included
+ in a future release of the IdP.
+ -->
<profile>
- <id>jetty-9.4</id>
+ <id>jetty-future</id>
<properties>
<idp-jetty-base.version>9.4.0-SNAPSHOT</idp-jetty-base.version>
- <jetty.version>9.4.6.v20170531</jetty.version>
+ <jetty.version>9.4.7.v20170914</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.
More information about the commits
mailing list