[gatein-commits] gatein SVN: r838 - in components/wci/trunk: jetty and 7 other directories.

Author: mwringe Date: 2009-11-27 11:59:16 -0500 (Fri, 27 Nov 2009) New Revision: 838 Modified: components/wci/trunk/ components/wci/trunk/jetty/pom.xml components/wci/trunk/pom.xml components/wci/trunk/test/core/pom.xml components/wci/trunk/test/servers/jboss42/pom.xml components/wci/trunk/test/servers/jboss51/pom.xml components/wci/trunk/test/servers/jetty6/pom.xml components/wci/trunk/test/servers/tomcat6/pom.xml components/wci/trunk/tomcat/pom.xml components/wci/trunk/wci/pom.xml Log: cleanup unnecessary maven dependencies (GTNWCI-10). Property changes on: components/wci/trunk ___________________________________________________________________ Name: svn:ignore - target .settings .project + target .settings .project .metadata Modified: components/wci/trunk/jetty/pom.xml =================================================================== --- components/wci/trunk/jetty/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/jetty/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -14,6 +14,10 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </dependency> </dependencies> </project> Modified: components/wci/trunk/pom.xml =================================================================== --- components/wci/trunk/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -29,7 +29,7 @@ <version.jetty>6.1.21</version.jetty> <version.jaxen>1.0-FCS</version.jaxen> <version.saxpath>1.0-FCS</version.saxpath> - + <version.discovery>0.4</version.discovery> <!-- used in test module by maven-antrun-extended-plugin --> <version.jboss.unit>1.2.3</version.jboss.unit> <version.cargo>1.0.1-alpha-1</version.cargo> @@ -115,7 +115,11 @@ <artifactId>jaxb-api</artifactId> <version>${version.jaxb}</version> </dependency> - + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>${version.discovery}</version> + </dependency> </dependencies> </dependencyManagement> Modified: components/wci/trunk/test/core/pom.xml =================================================================== --- components/wci/trunk/test/core/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/test/core/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -14,30 +14,7 @@ <artifactId>wci-wci</artifactId> </dependency> <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-exo</artifactId> - </dependency> - - <dependency> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </dependency> - <dependency> <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> <artifactId>common-mc</artifactId> </dependency> <dependency> @@ -57,23 +34,6 @@ <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-mc</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test-generic</artifactId> - </dependency> - </dependencies> <build> Modified: components/wci/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/test/servers/jboss42/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -168,7 +168,16 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + </dependencies> Modified: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -158,7 +158,16 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + </dependencies> Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-CR02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jetty6</artifactId> @@ -69,6 +69,21 @@ <artifactId>common-mc</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> <!-- JBOSS UNIT DEPENDENCIES --> <dependency> <groupId>org.jboss.unit</groupId> @@ -153,6 +168,16 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + <!-- Jetty Deployer --> <dependency> <groupId>org.codehaus.cargo</groupId> @@ -282,7 +307,9 @@ <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" /> <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" /> <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" /> - <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" /> + <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" /> + <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> + <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" /> <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" /> <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" /> <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> Modified: components/wci/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -168,7 +168,16 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + </dependencies> Modified: components/wci/trunk/tomcat/pom.xml =================================================================== --- components/wci/trunk/tomcat/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/tomcat/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -14,6 +14,16 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>catalina</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </project> Modified: components/wci/trunk/wci/pom.xml =================================================================== --- components/wci/trunk/wci/pom.xml 2009-11-27 12:43:11 UTC (rev 837) +++ components/wci/trunk/wci/pom.xml 2009-11-27 16:59:16 UTC (rev 838) @@ -11,11 +11,6 @@ <dependencies> <dependency> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> <exclusions> @@ -25,135 +20,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </dependency> - - <!-- SCOPE TEST --> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-mc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-remote</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-mc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test-generic</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-serialization</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </dependency> - <dependency> - <groupId>saxpath</groupId> - <artifactId>saxpath</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-jetty-deployer</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> </project>