4:52 a.m.
Author: thomas.heute(a)jboss.com
Date: 2010-04-27 05:52:13 -0400 (Tue, 27 Apr 2010)
New Revision: 2819
Modified:
components/pc/trunk/controller/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
components/pc/trunk/portal/src/build.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/src/test/build.xml
Log:
Prepare for new Nexus repo
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2010-04-27 09:40:50 UTC (rev 2818)
+++ components/pc/trunk/controller/pom.xml 2010-04-27 09:52:13 UTC (rev 2819)
@@ -42,10 +42,6 @@
<dependency>
<groupId>apache-xerces</groupId>
- <artifactId>resolver</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-04-27 09:40:50 UTC (rev 2818)
+++ components/pc/trunk/pom.xml 2010-04-27 09:52:13 UTC (rev 2819)
@@ -22,7 +22,7 @@
</scm>
<properties>
- <version.gatein.common>2.0.1-GA</version.gatein.common>
+ <version.gatein.common>2.0.2-GA</version.gatein.common>
<version.gatein.wci>2.0.1-GA</version.gatein.wci>
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.javax.jstl>1.1.2</version.javax.jstl>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.1-GA</version>
+ <version>1.0.2-GA</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -252,16 +252,6 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
- <repository>
- <id>codehaus snapshot repository</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2010-04-27 09:40:50 UTC (rev 2818)
+++ components/pc/trunk/portal/pom.xml 2010-04-27 09:52:13 UTC (rev 2819)
@@ -87,13 +87,9 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
- <dependency>
- <groupId>apache-taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
<dependency>
<groupId>apache-log4j</groupId>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2010-04-27 09:40:50
UTC (rev 2818)
+++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2010-04-27 09:52:13
UTC (rev 2819)
@@ -31,11 +31,9 @@
<include>sun-jaxb:jaxb-api</include>
<include>apache-xerces:xercesImpl</include>
- <include>apache-xerces:resolver</include>
<include>apache-xerces:xml-apis</include>
- <include>apache-taglibs:jstl</include>
- <include>apache-taglibs:standard</include>
+ <include>javax.servlet:jstl</include>
</includes>
</dependencySet>
Modified: components/pc/trunk/portal/src/build.xml
===================================================================
--- components/pc/trunk/portal/src/build.xml 2010-04-27 09:40:50 UTC (rev 2818)
+++ components/pc/trunk/portal/src/build.xml 2010-04-27 09:52:13 UTC (rev 2819)
@@ -54,7 +54,6 @@
</path>
<path id="mc.xerces">
<pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
<pathelement path="${dependency.xml-apis.jar}"/>
</path>
<path id="mc.javassist">
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-04-27 09:40:50 UTC (rev 2818)
+++ components/pc/trunk/test/pom.xml 2010-04-27 09:52:13 UTC (rev 2819)
@@ -384,7 +384,6 @@
<!-- <property name="dependency.jaxb.jar"
value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}" /> -->
<property name="dependency.jboss-mdr.jar"
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}" />
<property name="dependency.javassist.jar"
value="${maven.dependency.org.jboss.javassist.jar.path}" />
- <property name="dependency.resolver.jar"
value="${maven.dependency.apache-xerces.resolver.jar.path}" />
<property name="dependency.xercesImpl.jar"
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}" />
<property name="dependency.xml-apis.jar"
value="${maven.dependency.apache-xerces.xml-apis.jar.path}" />
<property name="dependency.jbossxb.jar"
value="${maven.dependency.org.jboss.jbossxb.jar.path}" />
@@ -394,8 +393,7 @@
<property name="dependency.cargo-ant.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}" />
<property name="dependency.cargo-manager.war"
value="${maven.dependency.cargo.cargo-manager.war.path}" />
- <property name="dependency.apache-jstl.jar"
value="${maven.dependency.apache-taglibs.jstl.jar.path}" />
- <property name="dependency.apache-standard.jar"
value="${maven.dependency.apache-taglibs.standard.jar.path}" />
+ <property name="dependency.apache-jstl.jar"
value="${maven.dependency.javax.servlet.jstl.jar.path}" />
<property name="dependency.cargo.jetty-deployer"
value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"
/>
<ant antfile="${basedir}/src/test/build.xml">
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2010-04-27 09:40:50 UTC (rev 2818)
+++ components/pc/trunk/test/src/test/build.xml 2010-04-27 09:52:13 UTC (rev 2819)
@@ -147,7 +147,6 @@
<path refid="jboss-microcontainer"/>
<pathelement path="${dependency.javassist.jar}"/>
<pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
<pathelement path="${dependency.xml-apis.jar}"/>
<pathelement path="${dependency.trove.jar}"/>
</path>
@@ -176,7 +175,6 @@
<path refid="jboss-microcontainer"/>
<pathelement path="${dependency.javassist.jar}"/>
<pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
<pathelement path="${dependency.xml-apis.jar}"/>
<pathelement path="${dependency.trove.jar}"/>
</path>