myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sobr...@apache.org
Subject svn commit: r656749 - in /myfaces/trinidad/trunk_1.2.x: ./ trinidad-api/ trinidad-assembly/ trinidad-build/ trinidad-examples/ trinidad-examples/trinidad-blank/ trinidad-examples/trinidad-demo/ trinidad-examples/trinidad-example-assembly/ trinidad-impl/
Date Thu, 15 May 2008 17:24:14 GMT
Author: sobryan
Date: Thu May 15 10:24:13 2008
New Revision: 656749

URL: http://svn.apache.org/viewvc?rev=656749&view=rev
Log:
Reverting failed release preparation

Modified:
    myfaces/trinidad/trunk_1.2.x/pom.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml

Modified: myfaces/trinidad/trunk_1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/pom.xml Thu May 15 10:24:13 2008
@@ -31,7 +31,7 @@
   <artifactId>trinidad</artifactId>
   <packaging>pom</packaging>
   <name>Apache MyFaces Trinidad 1.2</name>
-  <version>1.2.8</version>
+  <version>1.2.8-SNAPSHOT</version>
   <description>JSF 1.2 branch of Apache MyFaces Trinidad</description>
   <url>http://myfaces.apache.org/trinidad/trinidad-1_2</url>
 
@@ -106,9 +106,9 @@
   </mailingLists>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/trunk_1.2.x/tags/trinidad-1.2.8</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/trunk_1.2.x/tags/trinidad-1.2.8</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/trinidad/trunk_1.2.x/tags/trinidad-1.2.8</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/trunk_1.2.x</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/trunk_1.2.x</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/trinidad/trunk_1.2.x</url>
   </scm>
 
   <build>

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml Thu May 15 10:24:13 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml Thu May 15 10:24:13 2008
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
 
   <build>

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml Thu May 15 10:24:13 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml Thu May 15 10:24:13 2008
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <name>Apache MyFaces Trinidad Examples</name>

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml Thu May 15 10:24:13
2008
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml Thu May 15 10:24:13
2008
@@ -1,209 +1,210 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-  <parent>
-    <groupId>org.apache.myfaces.trinidad</groupId>
-    <artifactId>trinidad</artifactId>
-    <version>1.2.8</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <name>Apache MyFaces Trinidad Demo</name>
-  <description>Apache MyFaces Trinidad Demo</description>
-
-  <artifactId>trinidad-demo</artifactId>
-  <packaging>war</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.myfaces.trinidadbuild</groupId>
-        <artifactId>maven-jdev-plugin</artifactId>
-        <version>1.2.3</version>
-        <configuration>
-          <libraries>
-            <library>JSP Runtime</library>
-          </libraries>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>trinidad-api</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>trinidad-impl</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-      <version>1.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>jstl</groupId>
-      <artifactId>jstl</artifactId>
-    </dependency>
-
-<!-- Dependencies pulled in via myfaces/ri pom
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.6</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.5</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-      <scope>runtime</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>2.1</version>
-      <scope>runtime</scope>
-    </dependency>
--->
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-    </dependency>
-
-    <!-- For SourceCodeServlet -->
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-     <profile>
-       <id>jettyConfig</id>
-       <build>
-         <plugins>
-           <plugin>
-             <groupId>org.mortbay.jetty</groupId>
-             <artifactId>maven-jetty-plugin</artifactId>
-             <version>6.1.7</version>
-             <configuration>
-               <scanIntervalSeconds>10</scanIntervalSeconds>
-             </configuration>
-           </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- By default the war examples use myfaces! :) -->
-    <profile>
-      <id>myfaces</id>
-      <activation>
-        <property>
-          <name>!jsf</name>
-        </property>
-      </activation>
-      <dependencies>
-
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-api</artifactId>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-impl</artifactId>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
-    <profile>
-      <id>jsfri</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>ri</value>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-          <version>1.2_07</version>
-          <scope>compile</scope>
-        </dependency>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-impl</artifactId>
-          <version>1.2_07</version>
-          <scope>runtime</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</jsf_implementation>
-      </properties>
-    </profile>
-  </profiles>
-
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+	   
+-->
+  <parent>
+    <groupId>org.apache.myfaces.trinidad</groupId>
+    <artifactId>trinidad</artifactId>
+    <version>1.2.8-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <name>Apache MyFaces Trinidad Demo</name>
+  <description>Apache MyFaces Trinidad Demo</description>
+
+  <artifactId>trinidad-demo</artifactId>
+  <packaging>war</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.myfaces.trinidadbuild</groupId>
+        <artifactId>maven-jdev-plugin</artifactId>
+        <version>1.2.3</version>
+        <configuration>
+          <libraries>
+            <library>JSP Runtime</library>
+          </libraries>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>trinidad-api</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>trinidad-impl</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+    </dependency>
+
+<!-- Dependencies pulled in via myfaces/ri pom
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.6</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>1.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+-->
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+    </dependency>
+
+    <!-- For SourceCodeServlet -->
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.1</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+     <profile>
+       <id>jettyConfig</id>
+       <build>
+         <plugins>
+           <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.7</version>
+             <configuration>
+               <scanIntervalSeconds>10</scanIntervalSeconds>
+             </configuration>
+           </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- By default the war examples use myfaces! :) -->
+    <profile>
+      <id>myfaces</id>
+      <activation>
+        <property>
+          <name>!jsf</name>
+        </property>
+      </activation>
+      <dependencies>
+
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-api</artifactId>
+          <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
+    <profile>
+      <id>jsfri</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>ri</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-api</artifactId>
+          <version>1.2_07</version>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-impl</artifactId>
+          <version>1.2_07</version>
+          <scope>runtime</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</jsf_implementation>
+      </properties>
+    </profile>
+  </profiles>
+
+</project>

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml Thu May
15 10:24:13 2008
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad-example</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
 
   <build>

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml?rev=656749&r1=656748&r2=656749&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml Thu May 15 10:24:13 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>



Mime
View raw message