You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/08/20 19:50:28 UTC
svn commit: r987590 - in /myfaces/tomahawk/trunk: ./ core/ core12/ examples/
examples/simple20/ sandbox/core/ sandbox/core12/ sandbox/core20/
sandbox/examples/ sandbox15/core/ sandbox15/examples/
Author: struberg
Date: Fri Aug 20 17:50:27 2010
New Revision: 987590
URL: http://svn.apache.org/viewvc?rev=987590&view=rev
Log:
TOMAHAWK-1538 upgrade to newer JSR API dependencies
this commit also removes the troubleful dev.java.net maven repo
Modified:
myfaces/tomahawk/trunk/core/pom.xml
myfaces/tomahawk/trunk/core12/pom.xml
myfaces/tomahawk/trunk/examples/pom.xml
myfaces/tomahawk/trunk/examples/simple20/pom.xml
myfaces/tomahawk/trunk/pom.xml
myfaces/tomahawk/trunk/sandbox/core/pom.xml
myfaces/tomahawk/trunk/sandbox/core12/pom.xml
myfaces/tomahawk/trunk/sandbox/core20/pom.xml
myfaces/tomahawk/trunk/sandbox/examples/pom.xml
myfaces/tomahawk/trunk/sandbox15/core/pom.xml
myfaces/tomahawk/trunk/sandbox15/examples/pom.xml
Modified: myfaces/tomahawk/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/core/pom.xml Fri Aug 20 17:50:27 2010
@@ -171,10 +171,8 @@
<!-- Required for wrapper of FacesContext (compatible with 1.2) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
</dependency>
<!-- test dependencies -->
@@ -229,7 +227,6 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -273,15 +270,6 @@
</dependencies>
- <repositories>
- <!-- Repository for el-api -->
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<build>
<resources>
@@ -717,4 +705,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/tomahawk/trunk/core12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/pom.xml (original)
+++ myfaces/tomahawk/trunk/core12/pom.xml Fri Aug 20 17:50:27 2010
@@ -229,7 +229,6 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: myfaces/tomahawk/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/pom.xml Fri Aug 20 17:50:27 2010
@@ -127,8 +127,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -171,8 +169,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -215,8 +211,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -283,23 +277,6 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
-
- <repository>
- <id>Maven2 Repo1</id>
- <name>Maven2 Repo1</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>legacy</layout>
- </repository>
-
- </repositories>
-
<properties>
<jsf_implementation>JSF-RI</jsf_implementation>
</properties>
@@ -329,20 +306,9 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<properties>
<jsf_implementation>JSF-RI 1.2</jsf_implementation>
</properties>
@@ -372,18 +338,9 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java.net.2</id>
- <name>java.net Maven 2 Repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
<properties>
<jsf_implementation>JSF-RI 2.0</jsf_implementation>
@@ -447,19 +404,6 @@
</plugin>
</plugins>
</build>
- <repositories>
- <!--
- <repository>
- <id>OpenQA</id>
- <url>http://maven.openqa.org</url>
- </repository>
- -->
- <repository>
- <id>OpenQA_Release</id>
- <name>OpenQA Release Repository</name>
- <url>http://archiva.openqa.org/repository/releases/</url>
- </repository>
- </repositories>
</profile>
<!-- See: http://myfaces.apache.org/tomahawk/testing/hostedqa.html -->
@@ -473,26 +417,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>codehaus</id>
- <name>codehaus</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- <repository>
- <id>maven-hostedqa</id>
- <name>maven-hostedqa</name>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <url>http://maven.hostedqa.com</url>
- </repository>
- </repositories>
<build>
<plugins>
<plugin>
Modified: myfaces/tomahawk/trunk/examples/simple20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/pom.xml Fri Aug 20 17:50:27 2010
@@ -109,8 +109,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -145,19 +143,9 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java.net.2</id>
- <name>java.net Maven 2 Repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
-
<properties>
<jsf_implementation>JSF-RI 2.0</jsf_implementation>
</properties>
Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Fri Aug 20 17:50:27 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>6</version>
+ <version>8</version>
</parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
@@ -59,16 +59,28 @@
</plugins>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.14</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.14</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<reporting>
<plugins>
@@ -84,18 +96,6 @@
</plugins>
</reporting>
- <repositories>
- <repository>
- <id>myfaces-staging</id>
- <url>http://people.apache.org/builds/myfaces/m2-staging-repository</url>
- <releases>
- <enabled>false</enabled> <!-- Enable to test a MyFaces core release candidate with tomahawk -->
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
<distributionManagement>
<site>
@@ -189,4 +189,4 @@
<myfaces-builder-plugin-version>1.0.6</myfaces-builder-plugin-version>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/tomahawk/trunk/sandbox/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/pom.xml Fri Aug 20 17:50:27 2010
@@ -25,14 +25,6 @@
<url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk/trunk/sandbox/core</url>
</scm>
- <repositories>
- <repository>
- <id>java-net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<dependencies>
<!-- compile -->
@@ -176,7 +168,6 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: myfaces/tomahawk/trunk/sandbox/core12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core12/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core12/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core12/pom.xml Fri Aug 20 17:50:27 2010
@@ -22,14 +22,6 @@
<url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk/trunk/sandbox/core</url>
</scm>
- <repositories>
- <repository>
- <id>java-net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<dependencies>
<!-- compile -->
@@ -172,7 +164,6 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: myfaces/tomahawk/trunk/sandbox/core20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/pom.xml Fri Aug 20 17:50:27 2010
@@ -22,14 +22,6 @@
<url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk/trunk/sandbox/core</url>
</scm>
- <repositories>
- <repository>
- <id>java-net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<dependencies>
<!-- compile -->
@@ -166,7 +158,6 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -243,6 +234,7 @@
</goals>
<configuration>
<scanModel>true</scanModel>
+
<artifactItems>
<artifactItem>
<groupId>org.apache.myfaces.tomahawk</groupId>
Modified: myfaces/tomahawk/trunk/sandbox/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/pom.xml Fri Aug 20 17:50:27 2010
@@ -125,8 +125,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -199,15 +197,6 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<properties>
<jsf_implementation>JSF-RI</jsf_implementation>
</properties>
@@ -236,20 +225,9 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-M1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<properties>
<jsf_implementation>JSF-RI 1.2</jsf_implementation>
</properties>
Modified: myfaces/tomahawk/trunk/sandbox15/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/pom.xml Fri Aug 20 17:50:27 2010
@@ -120,10 +120,9 @@
</dependency>
<dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.4</version>
</dependency>
</dependencies>
Modified: myfaces/tomahawk/trunk/sandbox15/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/pom.xml?rev=987590&r1=987589&r2=987590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox15/examples/pom.xml Fri Aug 20 17:50:27 2010
@@ -116,15 +116,6 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<properties>
<jsf_implementation>JSF-RI</jsf_implementation>
</properties>