1:54 p.m.
Author: thomas.heute(a)jboss.com
Date: 2010-04-26 14:54:07 -0400 (Mon, 26 Apr 2010)
New Revision: 2793
Modified:
components/pc/trunk/pom.xml
components/pc/trunk/test/pom.xml
Log:
Preparing for new repo
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-04-26 18:14:37 UTC (rev 2792)
+++ components/pc/trunk/pom.xml 2010-04-26 18:54:07 UTC (rev 2793)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-GA</version>
+ <version>1.0.1-GA</version>
</parent>
<scm>
@@ -22,10 +22,10 @@
</scm>
<properties>
- <version.gatein.common>2.0.0-GA</version.gatein.common>
- <version.gatein.wci>2.0.0-GA</version.gatein.wci>
+ <version.gatein.common>2.0.1-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.apache.taglibs>1.1.2</version.apache.taglibs>
+ <version.javax.jstl>1.1.2</version.javax.jstl>
<version.apache.log4j>1.2.14</version.apache.log4j>
<!-- used in test module by maven-antrun-extended-plugin -->
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.0-GA</version>
+ <version>1.0.1-GA</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -112,15 +112,10 @@
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>${version.apache.taglibs}</version>
+ <version>${version.javax.jstl}</version>
</dependency>
- <dependency>
- <groupId>apache-taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>${version.apache.taglibs}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -244,26 +239,37 @@
<repositories>
<repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</snapshots>
</repository>
<repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-04-26 18:14:37 UTC (rev 2792)
+++ components/pc/trunk/test/pom.xml 2010-04-26 18:54:07 UTC (rev 2793)
@@ -173,13 +173,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>
</dependencies>
<profiles>
@@ -275,6 +271,8 @@
</profile>
</profiles>
+
+
<build>
<plugins>
<plugin>