Author: rahul
Date: Thu Jan 11 12:43:53 2007
New Revision: 495368
URL: http://svn.apache.org/viewvc?view=rev&rev=495368
Log:
Backport r493540, r493901, (part of) r493913, r493917 and r493921 so the 1.0.x
line is upto date with any interim changes made to trunk during the v1.0.4
release. POM changes from r493642 and (remainder of) r493913 are not included
here since the JSF impl dependencies are needed for SHALE-262 which is not part
of the 1.0.x line.
SHALE-380
Modified:
shale/framework/branches/SHALE_1_0_X/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml
shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml
Modified: shale/framework/branches/SHALE_1_0_X/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/pom.xml?view=diff&rev=495368&r1=495367&r2=495368
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/pom.xml (original)
+++ shale/framework/branches/SHALE_1_0_X/pom.xml Thu Jan 11 12:43:53 2007
@@ -56,6 +56,15 @@
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
<releases><enabled>false</enabled></releases>
</repository>
+ <repository>
+ <id>java.net</id>
+<!--
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+-->
+ <!-- Mirror of standard repository that uses http not https -->
+ <url>http://maven1.glassfishwiki.org</url>
+ <layout>legacy</layout>
+ </repository>
</repositories>
<!-- http://jira.codehaus.org/browse/MNG-2136 -->
Modified: shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml?view=diff&rev=495368&r1=495367&r2=495368
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml
(original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml Thu
Jan 11 12:43:53 2007
@@ -35,6 +35,12 @@
<packaging>jar</packaging>
<name>MailReader JPA Entity Classes</name>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shale/framework/trunk/shale-apps/mailreader-jpa</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shale/framework/trunk/shale-apps/mailreader-jpa</developerConnection>
+
<url>http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/mailreader-jpa</url>
+ </scm>
+
<dependencies>
<dependency>
Modified: shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml?view=diff&rev=495368&r1=495367&r2=495368
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml (original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml Thu Jan 11 12:43:53
2007
@@ -228,16 +228,10 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1</version>
+ <version>1.0</version>
<scope>provided</scope> <!-- JSP 2.1 requires it -->
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
- <version>1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2_03</version>
@@ -276,7 +270,7 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1</version>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml?view=diff&rev=495368&r1=495367&r2=495368
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml (original)
+++ shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml Thu Jan 11 12:43:53
2007
@@ -136,7 +136,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_02</version>
+ <version>1.2_03</version>
<scope>provided</scope>
</dependency>
<dependency>
