Author: manaRH Date: 2009-08-28 09:47:56 -0400 (Fri, 28 Aug 2009) New Revision: 11445 Modified: branches/enterprise/JBPAPP_5_0/build/core.pom.xml branches/enterprise/JBPAPP_5_0/build/debug.pom.xml branches/enterprise/JBPAPP_5_0/build/excel.pom.xml branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml branches/enterprise/JBPAPP_5_0/build/pdf.pom.xml branches/enterprise/JBPAPP_5_0/build/remoting.pom.xml branches/enterprise/JBPAPP_5_0/build/root.pom.xml branches/enterprise/JBPAPP_5_0/build/ui.pom.xml Log: JBPAPP-2660 Modified: branches/enterprise/JBPAPP_5_0/build/core.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/core.pom.xml 2009-08-28 09:39:07 UTC (rev 11444) +++ branches/enterprise/JBPAPP_5_0/build/core.pom.xml 2009-08-28 13:47:56 UTC (rev 11445) @@ -72,7 +72,7 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> <optional>true</optional> <scope>provided</scope> @@ -334,11 +334,23 @@ </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <optional>true</optional> </dependency> + <dependency> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.openid4java</groupId> <artifactId>openid4java</artifactId> Modified: branches/enterprise/JBPAPP_5_0/build/debug.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/debug.pom.xml 2009-08-28 09:39:07 UTC (rev 11444) +++ branches/enterprise/JBPAPP_5_0/build/debug.pom.xml 2009-08-28 13:47:56 UTC (rev 11445) @@ -39,7 +39,7 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/JBPAPP_5_0/build/excel.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/excel.pom.xml 2009-08-28 09:39:07 UTC (rev 11444) +++ branches/enterprise/JBPAPP_5_0/build/excel.pom.xml 2009-08-28 13:47:56 UTC (rev 11445) @@ -48,7 +48,7 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml 2009-08-28 09:39:07 UTC (rev 11444) +++ branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml 2009-08-28 13:47:56 UTC (rev 11445) @@ -67,7 +67,7 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/JBPAPP_5_0/build/pdf.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/pdf.pom.xml 2009-08-28 09:39:07 UTC (rev 11444) +++ branches/enterprise/JBPAPP_5_0/build/pdf.pom.xml 2009-08-28 13:47:56 UTC (rev 11445) @@ -53,7 +53,7 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/JBPAPP_5_0/build/remoting.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/remoting.pom.xml 2009-08-28 09:39:07 UTC (rev 11444) +++ branches/enterprise/JBPAPP_5_0/build/remoting.pom.xml 2009-08-28 13:47:56 UTC (rev 11445) @@ -39,7 +39,7 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-08-28 09:39:07 UTC (rev 11444) +++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-08-28 13:47:56 UTC (rev 11445) @@ -125,10 +125,15 @@ <version&gt;@seam.version(a)&lt;/version&gt; </dependency> +<!-- <dependency>--> +<!-- <groupId>javax.servlet</groupId>--> +<!-- <artifactId>servlet-api</artifactId>--> +<!-- <version>2.5</version>--> +<!-- </dependency>--> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>2.1.3.GA</version> </dependency> <dependency> @@ -254,6 +259,10 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> + </exclusion> </exclusions> </dependency> @@ -347,6 +356,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> @@ -379,6 +392,10 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> @@ -451,7 +468,7 @@ <artifactId>jboss-logging-spi</artifactId> </exclusion> <exclusion> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> </exclusion> <exclusion> @@ -856,12 +873,6 @@ <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> <version>2.1.2.GA</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -871,9 +882,9 @@ </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> + <version>2.2.14.GA</version> <exclusions> <exclusion> <groupId>apache-xerces</groupId> @@ -948,6 +959,18 @@ </exclusions> </dependency> + <dependency> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> <groupId>org.openid4java</groupId> <artifactId>openid4java</artifactId> @@ -968,18 +991,17 @@ <artifactId>xmlsec</artifactId> </exclusion> - <!-- + <exclusion> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </exclusion> - --> - <!-- + <exclusion> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </exclusion> - --> + <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -1081,13 +1103,13 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.4.2</version> + <version>1.5.8</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> + <version>1.5.8</version> </dependency> <dependency> Modified: branches/enterprise/JBPAPP_5_0/build/ui.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/ui.pom.xml 2009-08-28 09:39:07 UTC (rev 11444) +++ branches/enterprise/JBPAPP_5_0/build/ui.pom.xml 2009-08-28 13:47:56 UTC (rev 11445) @@ -62,7 +62,7 @@ <dependencies> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> <optional>true</optional> <scope>provided</scope>