You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/04/14 03:53:57 UTC
svn commit: r933835 - in /myfaces/core/branches/2_0_0prepare: api/pom.xml
api/src/main/resources/META-INF/resources/ impl/pom.xml
Author: lu4242
Date: Wed Apr 14 01:53:57 2010
New Revision: 933835
URL: http://svn.apache.org/viewvc?rev=933835&view=rev
Log:
update versions and copy jsf.js to remove dependency to javascript plugin (timestamped snapshot make release plugin fails)
Added:
myfaces/core/branches/2_0_0prepare/api/src/main/resources/META-INF/resources/
Modified:
myfaces/core/branches/2_0_0prepare/api/pom.xml
myfaces/core/branches/2_0_0prepare/impl/pom.xml
Modified: myfaces/core/branches/2_0_0prepare/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0prepare/api/pom.xml?rev=933835&r1=933834&r2=933835&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0prepare/api/pom.xml (original)
+++ myfaces/core/branches/2_0_0prepare/api/pom.xml Wed Apr 14 01:53:57 2010
@@ -27,11 +27,12 @@
please do not delete this it is just disabled for now
-->
-
+<!--
<plugin>
<artifactId>javascript-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo.javascript</groupId>
+ <groupId>org.codehaus.mojo.javascript</groupId> -->
<!-- we have to enforce a version for now which works due to the alpha stage of the plugin -->
+ <!--
<version>1.0-alpha-1-20090530.211438-7</version>
<extensions>true</extensions>
<executions>
@@ -64,6 +65,7 @@
<outputDirectory>${basedir}/target/classes/META-INF/resources/javax.faces/</outputDirectory>
</configuration>
</plugin>
+ -->
<plugin>
@@ -107,24 +109,28 @@
but for the core apis this should be sufficient
-->
+ <!--
<plugin>
<groupId>de.berlios.jsunit</groupId>
<artifactId>jsunit-maven2-plugin</artifactId>
- <executions>
+ <executions> -->
<!--execution>
<id>test</id>
<goals>
<goal>jsunit-test</goal>
</goals>
</execution-->
+ <!--
</executions>
<configuration>
<sourceDirectory>src/main/javascript/META-INF/resources</sourceDirectory>
<sources>
<source>../../../../test/javascript/org/apache/myfaces/mockups/BrowserMockups.js</source>
+ -->
<!--
<source>javax/faces/_util/OpenAjax.js</source>
-->
+ <!--
<source>javax/faces/_util/_JSF2Utils.js</source>
<source>javax/faces/ajax/Ajax.js</source>
<source>../../../../test/javascript/org/apache/myfaces/test/_TestScenario.js</source>
@@ -145,7 +151,7 @@
</testSuite>
</testSuites>
</configuration>
- </plugin>
+ </plugin>-->
<!--
<plugin>
@@ -421,7 +427,7 @@
<dependency>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test20</artifactId>
- <version>1.0.0-beta</version>
+ <version>1.0.0-beta-3</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: myfaces/core/branches/2_0_0prepare/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0prepare/impl/pom.xml?rev=933835&r1=933834&r2=933835&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0prepare/impl/pom.xml (original)
+++ myfaces/core/branches/2_0_0prepare/impl/pom.xml Wed Apr 14 01:53:57 2010
@@ -916,7 +916,7 @@
<dependency>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test20</artifactId>
- <version>1.0.0-beta</version>
+ <version>1.0.0-beta-3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1031,7 +1031,7 @@
</repositories>
<properties>
- <myfaces-shared.version>4.0.1-SNAPSHOT</myfaces-shared.version>
+ <myfaces-shared.version>4.0.1</myfaces-shared.version>
<myfaces-builder-plugin.version>1.0.5</myfaces-builder-plugin.version>
</properties>
</project>