Repository: cxf-fediz Updated Branches: refs/heads/master 14121d6f2 -> 7f026762f
Revert "[maven-release-plugin] prepare release fediz-1.2.0" This reverts commit 14121d6f2c114bb7c08f675afa93e3a6c622c5b4. Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/7f026762 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/7f026762 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/7f026762 Branch: refs/heads/master Commit: 7f026762f2f03a721d2d2a04f7d06632a6e64c1e Parents: 14121d6 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Apr 24 18:20:44 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Apr 24 18:20:44 2015 +0100 ---------------------------------------------------------------------- apache-fediz/pom.xml | 4 +-- examples/pom.xml | 2 +- examples/simpleWebapp/pom.xml | 2 +- examples/spring2Webapp/pom.xml | 2 +- examples/springPreauthWebapp/pom.xml | 2 +- examples/springWebapp/pom.xml | 2 +- examples/wsclientWebapp/pom.xml | 2 +- examples/wsclientWebapp/webapp/pom.xml | 2 +- .../wsclientWebapp/webservice/common/pom.xml | 2 +- examples/wsclientWebapp/webservice/pom.xml | 2 +- .../wsclientWebapp/webservice/service/pom.xml | 2 +- plugins/core/pom.xml | 2 +- plugins/cxf/pom.xml | 2 +- plugins/jetty/pom.xml | 5 ++-- plugins/pom.xml | 2 +- plugins/spring/pom.xml | 5 ++-- plugins/spring2/pom.xml | 5 ++-- plugins/tomcat7/pom.xml | 5 ++-- pom.xml | 5 ++-- services/idp/pom.xml | 26 +++++++++++++------- services/pom.xml | 2 +- services/sts/pom.xml | 8 +++--- systests/cxf/pom.xml | 2 +- systests/federation/pom.xml | 2 +- systests/federation/samlIdpWebapp/pom.xml | 2 +- systests/federation/samlsso/pom.xml | 2 +- systests/federation/wsfed/pom.xml | 2 +- systests/jetty8/pom.xml | 2 +- systests/kerberos/pom.xml | 2 +- systests/pom.xml | 2 +- systests/spring/pom.xml | 2 +- systests/tests/pom.xml | 2 +- systests/tomcat7/pom.xml | 2 +- systests/webapps/cxfWebapp/pom.xml | 2 +- systests/webapps/pom.xml | 2 +- systests/webapps/simpleWebapp/pom.xml | 2 +- systests/webapps/spring2Webapp/pom.xml | 2 +- systests/webapps/springPreauthWebapp/pom.xml | 2 +- systests/webapps/springWebapp/pom.xml | 2 +- 39 files changed, 69 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/apache-fediz/pom.xml ---------------------------------------------------------------------- diff --git a/apache-fediz/pom.xml b/apache-fediz/pom.xml index 695268f..29e4a55 100644 --- a/apache-fediz/pom.xml +++ b/apache-fediz/pom.xml @@ -21,14 +21,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.fediz</groupId> <artifactId>apache-fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <name>Apache Fediz Assembly</name> <packaging>pom</packaging> <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index ea2e4bf..f695626 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/simpleWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simpleWebapp/pom.xml b/examples/simpleWebapp/pom.xml index 8c39ba5..fc87cb0 100644 --- a/examples/simpleWebapp/pom.xml +++ b/examples/simpleWebapp/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>examples</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/spring2Webapp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/spring2Webapp/pom.xml b/examples/spring2Webapp/pom.xml index 36e7222..be2a330 100644 --- a/examples/spring2Webapp/pom.xml +++ b/examples/spring2Webapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>examples</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples</groupId> <artifactId>spring2Webapp</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/springPreauthWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/springPreauthWebapp/pom.xml b/examples/springPreauthWebapp/pom.xml index 3227805..679c50c 100644 --- a/examples/springPreauthWebapp/pom.xml +++ b/examples/springPreauthWebapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>examples</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples</groupId> <artifactId>springPreauthWebapp</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/springWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/springWebapp/pom.xml b/examples/springWebapp/pom.xml index 4b78237..f32a97a 100644 --- a/examples/springWebapp/pom.xml +++ b/examples/springWebapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>examples</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples</groupId> <artifactId>springWebapp</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/wsclientWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/wsclientWebapp/pom.xml b/examples/wsclientWebapp/pom.xml index c7ee6a2..8af84b2 100644 --- a/examples/wsclientWebapp/pom.xml +++ b/examples/wsclientWebapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>examples</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples</groupId> <artifactId>wsclientWebapp</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/wsclientWebapp/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/wsclientWebapp/webapp/pom.xml b/examples/wsclientWebapp/webapp/pom.xml index eea7f63..093d9ba 100644 --- a/examples/wsclientWebapp/webapp/pom.xml +++ b/examples/wsclientWebapp/webapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.examples</groupId> <artifactId>wsclientWebapp</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId> <artifactId>webapp</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/wsclientWebapp/webservice/common/pom.xml ---------------------------------------------------------------------- diff --git a/examples/wsclientWebapp/webservice/common/pom.xml b/examples/wsclientWebapp/webservice/common/pom.xml index 27fe378..69331bf 100644 --- a/examples/wsclientWebapp/webservice/common/pom.xml +++ b/examples/wsclientWebapp/webservice/common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId> <artifactId>webservice</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples.wsclientWebapp.webservice</groupId> <artifactId>common</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/wsclientWebapp/webservice/pom.xml ---------------------------------------------------------------------- diff --git a/examples/wsclientWebapp/webservice/pom.xml b/examples/wsclientWebapp/webservice/pom.xml index ec731ed..ce27cfd 100644 --- a/examples/wsclientWebapp/webservice/pom.xml +++ b/examples/wsclientWebapp/webservice/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.examples</groupId> <artifactId>wsclientWebapp</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId> <artifactId>webservice</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/examples/wsclientWebapp/webservice/service/pom.xml ---------------------------------------------------------------------- diff --git a/examples/wsclientWebapp/webservice/service/pom.xml b/examples/wsclientWebapp/webservice/service/pom.xml index f6ffa28..e4b09b8 100644 --- a/examples/wsclientWebapp/webservice/service/pom.xml +++ b/examples/wsclientWebapp/webservice/service/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId> <artifactId>webservice</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.examples.wsclientWebapp.webservice</groupId> <artifactId>fedizservice</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/plugins/core/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml index f92e85d..fc53ba5 100644 --- a/plugins/core/pom.xml +++ b/plugins/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>plugin</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>fediz-core</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/plugins/cxf/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml index fdae65b..6df62e6 100644 --- a/plugins/cxf/pom.xml +++ b/plugins/cxf/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>plugin</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>fediz-cxf</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/plugins/jetty/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/jetty/pom.xml b/plugins/jetty/pom.xml index c5f7bb6..880d74b 100644 --- a/plugins/jetty/pom.xml +++ b/plugins/jetty/pom.xml @@ -17,12 +17,13 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>plugin</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>fediz-jetty</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index c8b3422..e81424c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>plugin</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/plugins/spring/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index e91f16e..0738aac 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -17,12 +17,13 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>plugin</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>fediz-spring</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/plugins/spring2/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/spring2/pom.xml b/plugins/spring2/pom.xml index 85fe6fc..b22328c 100644 --- a/plugins/spring2/pom.xml +++ b/plugins/spring2/pom.xml @@ -17,12 +17,13 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>plugin</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>fediz-spring2</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/plugins/tomcat7/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/tomcat7/pom.xml b/plugins/tomcat7/pom.xml index 6c305d9..eda6300 100644 --- a/plugins/tomcat7/pom.xml +++ b/plugins/tomcat7/pom.xml @@ -17,12 +17,13 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>plugin</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>fediz-tomcat7</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0983729..3348d25 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <name>Apache Fediz</name> <packaging>pom</packaging> @@ -102,8 +102,7 @@ <scm> <connection>scm:git:http://git-wip-us.apache.org/repos/asf/cxf-fediz.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/cxf-fediz.git</developerConnection> - <tag>fediz-1.2.0</tag> - </scm> + </scm> <issueManagement> <system>jira</system> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/services/idp/pom.xml ---------------------------------------------------------------------- diff --git a/services/idp/pom.xml b/services/idp/pom.xml index 5c5dcbc..cd18741 100644 --- a/services/idp/pom.xml +++ b/services/idp/pom.xml @@ -17,12 +17,13 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>fediz-idp</artifactId> @@ -364,11 +365,13 @@ <stopPort>${idp.stop.port}</stopPort> <stopKey>STOP</stopKey> <connectors> - <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> + <connector + implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> <port>${idp.http.port}</port> <maxIdleTime>30000</maxIdleTime> </connector> - <connector implementation="org.eclipse.jetty.server.ssl.SslSelectChannelConnector"> + <connector + implementation="org.eclipse.jetty.server.ssl.SslSelectChannelConnector"> <port>${idp.https.port}</port> <maxIdleTime>30000</maxIdleTime> <keystore>${basedir}/../../examples/samplekeys/idp-ssl-server.jks</keystore> @@ -377,12 +380,14 @@ </connector> </connectors> <contextHandlers> - <contextHandler implementation="org.eclipse.jetty.webapp.WebAppContext"> + <contextHandler + implementation="org.eclipse.jetty.webapp.WebAppContext"> <war>${basedir}/target/fediz-idp-sts.war</war> <contextPath>/fediz-idp-sts</contextPath> <throwUnavailableOnStartupException>false</throwUnavailableOnStartupException> </contextHandler> - <contextHandler implementation="org.eclipse.jetty.webapp.WebAppContext"> + <contextHandler + implementation="org.eclipse.jetty.webapp.WebAppContext"> <war>${basedir}/target/fediz-idp.war</war> <contextPath>/fediz-idp</contextPath> </contextHandler> @@ -493,7 +498,8 @@ <artifactId>jetty-maven-plugin</artifactId> <configuration> <contextHandlers> - <contextHandler implementation="org.eclipse.jetty.webapp.WebAppContext"> + <contextHandler + implementation="org.eclipse.jetty.webapp.WebAppContext"> <war>${basedir}/target/fediz-idp.war</war> <contextPath>/fediz-idp</contextPath> </contextHandler> @@ -520,7 +526,8 @@ <artifactId>jetty-maven-plugin</artifactId> <configuration> <contextHandlers> - <contextHandler implementation="org.eclipse.jetty.webapp.WebAppContext"> + <contextHandler + implementation="org.eclipse.jetty.webapp.WebAppContext"> <war>${basedir}/target/fediz-idp-remote.war</war> <contextPath>/fediz-idp-remote</contextPath> </contextHandler> @@ -579,7 +586,8 @@ <artifactId>jetty-maven-plugin</artifactId> <configuration> <contextHandlers combine.children="append"> - <contextHandler implementation="org.eclipse.jetty.webapp.WebAppContext"> + <contextHandler + implementation="org.eclipse.jetty.webapp.WebAppContext"> <war>${basedir}/target/fediz-idp-sts.war</war> <contextPath>/fediz-idp-sts</contextPath> </contextHandler> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/services/pom.xml ---------------------------------------------------------------------- diff --git a/services/pom.xml b/services/pom.xml index 30d583b..8be60b8 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/services/sts/pom.xml ---------------------------------------------------------------------- diff --git a/services/sts/pom.xml b/services/sts/pom.xml index 9c8aaca..7bb03b7 100644 --- a/services/sts/pom.xml +++ b/services/sts/pom.xml @@ -17,12 +17,13 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>fediz-idp-sts</artifactId> @@ -193,7 +194,8 @@ </webApp> <scanIntervalSeconds>0</scanIntervalSeconds> <connectors> - <connector implementation="org.eclipse.jetty.server.ssl.SslSelectChannelConnector"> + <connector + implementation="org.eclipse.jetty.server.ssl.SslSelectChannelConnector"> <port>${sts.https.port}</port> <maxIdleTime>60000</maxIdleTime> <keystore>${project.build.directory}/test-classes/jetty-ssl.keystore</keystore> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/cxf/pom.xml ---------------------------------------------------------------------- diff --git a/systests/cxf/pom.xml b/systests/cxf/pom.xml index a0eb14a..f7c32a2 100644 --- a/systests/cxf/pom.xml +++ b/systests/cxf/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/federation/pom.xml ---------------------------------------------------------------------- diff --git a/systests/federation/pom.xml b/systests/federation/pom.xml index 55fc21d..0cd60d3 100644 --- a/systests/federation/pom.xml +++ b/systests/federation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/federation/samlIdpWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/systests/federation/samlIdpWebapp/pom.xml b/systests/federation/samlIdpWebapp/pom.xml index 7cb5e9b..10b6cdf 100644 --- a/systests/federation/samlIdpWebapp/pom.xml +++ b/systests/federation/samlIdpWebapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-federation</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests.federation</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/federation/samlsso/pom.xml ---------------------------------------------------------------------- diff --git a/systests/federation/samlsso/pom.xml b/systests/federation/samlsso/pom.xml index e6f78e3..8279bc7 100644 --- a/systests/federation/samlsso/pom.xml +++ b/systests/federation/samlsso/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-federation</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests.federation</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/federation/wsfed/pom.xml ---------------------------------------------------------------------- diff --git a/systests/federation/wsfed/pom.xml b/systests/federation/wsfed/pom.xml index 118533b..9b72584 100644 --- a/systests/federation/wsfed/pom.xml +++ b/systests/federation/wsfed/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-federation</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests.federation</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/jetty8/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jetty8/pom.xml b/systests/jetty8/pom.xml index 114a3f9..305fa70 100644 --- a/systests/jetty8/pom.xml +++ b/systests/jetty8/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/kerberos/pom.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml index 199ec6e..0fb0571 100644 --- a/systests/kerberos/pom.xml +++ b/systests/kerberos/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/pom.xml ---------------------------------------------------------------------- diff --git a/systests/pom.xml b/systests/pom.xml index 901cb5c..3e8e823 100644 --- a/systests/pom.xml +++ b/systests/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/spring/pom.xml ---------------------------------------------------------------------- diff --git a/systests/spring/pom.xml b/systests/spring/pom.xml index 83e467f..cd3bf28 100644 --- a/systests/spring/pom.xml +++ b/systests/spring/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/tests/pom.xml ---------------------------------------------------------------------- diff --git a/systests/tests/pom.xml b/systests/tests/pom.xml index 07ddc04..950046a 100644 --- a/systests/tests/pom.xml +++ b/systests/tests/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/tomcat7/pom.xml ---------------------------------------------------------------------- diff --git a/systests/tomcat7/pom.xml b/systests/tomcat7/pom.xml index 5721a46..d214223 100644 --- a/systests/tomcat7/pom.xml +++ b/systests/tomcat7/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/webapps/cxfWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/systests/webapps/cxfWebapp/pom.xml b/systests/webapps/cxfWebapp/pom.xml index b2c0ecc..6e6166a 100644 --- a/systests/webapps/cxfWebapp/pom.xml +++ b/systests/webapps/cxfWebapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-webapps</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests.webapps</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/webapps/pom.xml ---------------------------------------------------------------------- diff --git a/systests/webapps/pom.xml b/systests/webapps/pom.xml index c14987f..9c1d2e9 100644 --- a/systests/webapps/pom.xml +++ b/systests/webapps/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz</groupId> <artifactId>fediz-systests</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-webapps</artifactId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/webapps/simpleWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/systests/webapps/simpleWebapp/pom.xml b/systests/webapps/simpleWebapp/pom.xml index 74ffdf5..eec817c 100644 --- a/systests/webapps/simpleWebapp/pom.xml +++ b/systests/webapps/simpleWebapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-webapps</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests.webapps</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/webapps/spring2Webapp/pom.xml ---------------------------------------------------------------------- diff --git a/systests/webapps/spring2Webapp/pom.xml b/systests/webapps/spring2Webapp/pom.xml index e565bbc..8f40f2c 100644 --- a/systests/webapps/spring2Webapp/pom.xml +++ b/systests/webapps/spring2Webapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-webapps</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests.webapps</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/webapps/springPreauthWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/systests/webapps/springPreauthWebapp/pom.xml b/systests/webapps/springPreauthWebapp/pom.xml index 2d3b8c3..aaa7992 100644 --- a/systests/webapps/springPreauthWebapp/pom.xml +++ b/systests/webapps/springPreauthWebapp/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-webapps</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests.webapps</groupId> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7f026762/systests/webapps/springWebapp/pom.xml ---------------------------------------------------------------------- diff --git a/systests/webapps/springWebapp/pom.xml b/systests/webapps/springWebapp/pom.xml index cc203ed..ebf8337 100644 --- a/systests/webapps/springWebapp/pom.xml +++ b/systests/webapps/springWebapp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.cxf.fediz.systests</groupId> <artifactId>fediz-systests-webapps</artifactId> - <version>1.2.0</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.cxf.fediz.systests.webapps</groupId>
