Author: mposolda Date: 2012-01-09 09:52:42 -0500 (Mon, 09 Jan 2012) New Revision: 8285 Modified: components/sso/trunk/agent/pom.xml components/sso/trunk/cas/gatein-cas-plugin/pom.xml components/sso/trunk/cas/gatein-cas-portal/pom.xml components/sso/trunk/cas/pom.xml components/sso/trunk/josso/gatein-agent-josso181/pom.xml components/sso/trunk/josso/gatein-agent-josso182/pom.xml components/sso/trunk/josso/gatein-josso-plugin/pom.xml components/sso/trunk/josso/gatein-josso-portal/pom.xml components/sso/trunk/josso/pom.xml components/sso/trunk/opensso/gatein-opensso-portal/pom.xml components/sso/trunk/opensso/pom.xml components/sso/trunk/packaging/pom.xml components/sso/trunk/pom.xml components/sso/trunk/spnego/pom.xml Log: GTNSSO-2 Packaging improvements Modified: components/sso/trunk/agent/pom.xml =================================================================== --- components/sso/trunk/agent/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/agent/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -77,7 +77,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> <configuration> <skip>true</skip> </configuration> @@ -85,7 +84,6 @@ <plugin> <groupId>org.apache.xbean</groupId> <artifactId>maven-xbean-plugin</artifactId> - <version>${version.xbean}</version> <executions> <execution> <configuration> @@ -112,7 +110,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> <configuration> <skip>true</skip> </configuration> Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -39,7 +39,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> <configuration> <skip>true</skip> </configuration> @@ -58,7 +57,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> <configuration> <skip>true</skip> </configuration> Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -2,6 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> + <relativePath>../pom.xml</relativePath> <version>1.1.1-CR01-SNAPSHOT</version> </parent> @@ -14,7 +15,6 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-plugin</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -23,17 +23,14 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.jasig.cas</groupId> <artifactId>cas-client-core</artifactId> - <version>${version.cas.client}</version> </dependency> </dependencies> @@ -41,7 +38,6 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> Modified: components/sso/trunk/cas/pom.xml =================================================================== --- components/sso/trunk/cas/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/cas/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -9,6 +9,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <name>GateIn SSO - CAS</name> Modified: components/sso/trunk/josso/gatein-agent-josso181/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -4,6 +4,7 @@ <artifactId>sso-josso-parent</artifactId> <groupId>org.gatein.sso</groupId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/josso/gatein-agent-josso182/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -4,6 +4,7 @@ <artifactId>sso-josso-parent</artifactId> <groupId>org.gatein.sso</groupId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -3,6 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,7 +38,6 @@ <plugin> <groupId>org.apache.xbean</groupId> <artifactId>maven-xbean-plugin</artifactId> - <version>${version.xbean}</version> <executions> <execution> <configuration> Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -3,6 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -83,7 +84,6 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> Modified: components/sso/trunk/josso/pom.xml =================================================================== --- components/sso/trunk/josso/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/josso/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -9,6 +9,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -3,6 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,7 +15,6 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-plugin</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -23,17 +23,14 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>${version.commons-logging}</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>${project.version}</version> </dependency> </dependencies> @@ -41,7 +38,6 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> Modified: components/sso/trunk/opensso/pom.xml =================================================================== --- components/sso/trunk/opensso/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/opensso/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -9,6 +9,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> Modified: components/sso/trunk/packaging/pom.xml =================================================================== --- components/sso/trunk/packaging/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/packaging/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -3,6 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <version>1.1.1-CR01-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,12 +15,10 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>spnego</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.jboss.security</groupId> @@ -32,7 +31,6 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> Modified: components/sso/trunk/pom.xml =================================================================== --- components/sso/trunk/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -105,6 +105,11 @@ </dependency> <dependency> <groupId>org.gatein.sso</groupId> + <artifactId>sso-cas-plugin</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-plugin</artifactId> <version>${project.version}</version> </dependency> @@ -118,6 +123,16 @@ <artifactId>sso-agent-josso182</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-opensso-plugin</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>spnego</artifactId> + <version>${project.version}</version> + </dependency> <!-- junit --> <dependency> @@ -227,6 +242,11 @@ <artifactId>log4j</artifactId> <version>${version.log4j}</version> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons-logging}</version> + </dependency> <!-- httpclient --> <dependency> @@ -348,9 +368,24 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.2</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <groupId>org.apache.xbean</groupId> + <artifactId>maven-xbean-plugin</artifactId> + <version>${version.xbean}</version> + </plugin> </plugins> </pluginManagement> <plugins> Modified: components/sso/trunk/spnego/pom.xml =================================================================== --- components/sso/trunk/spnego/pom.xml 2012-01-09 14:00:39 UTC (rev 8284) +++ components/sso/trunk/spnego/pom.xml 2012-01-09 14:52:42 UTC (rev 8285) @@ -28,7 +28,6 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>${project.version}</version> </dependency> </dependencies> @@ -47,7 +46,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> <configuration> <skip>true</skip> </configuration>