You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/09/24 08:27:46 UTC

svn commit: r578671 - in /myfaces/tobago/trunk: example/facelets/pom.xml extension/facelets/pom.xml

Author: bommel
Date: Sun Sep 23 23:27:44 2007
New Revision: 578671

URL: http://svn.apache.org/viewvc?rev=578671&view=rev
Log:
(TOBAGO-496) Update dependency of facelets to 1.1.13

Modified:
    myfaces/tobago/trunk/example/facelets/pom.xml
    myfaces/tobago/trunk/extension/facelets/pom.xml

Modified: myfaces/tobago/trunk/example/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/facelets/pom.xml?rev=578671&r1=578670&r2=578671&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/example/facelets/pom.xml Sun Sep 23 23:27:44 2007
@@ -48,6 +48,14 @@
     <url>http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/facelets</url>
   </scm>
 
+  <repositories>
+    <repository>
+      <id>java.net</id>
+      <url>http://download.java.net/maven/1</url>
+      <layout>legacy</layout>
+    </repository>
+  </repositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
@@ -94,7 +102,7 @@
     <dependency>
       <groupId>com.sun.facelets</groupId>
       <artifactId>jsf-facelets</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.13</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
@@ -157,6 +165,32 @@
           <scope>runtime</scope>
         </dependency>
       </dependencies>
+    </profile>
+    <profile>
+      <!--
+       mvn package cargo:start -Ptomcat5x
+      -->
+      <id>tomcat5x</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.cargo</groupId>
+            <artifactId>cargo-maven2-plugin</artifactId>
+            <configuration>
+              <container>
+                <containerId>tomcat5x</containerId>
+                <zipUrlInstaller>
+                  <url>http://apache.easy-webs.de/tomcat/tomcat-5/v5.5.23/bin/apache-tomcat-5.5.23.zip</url>
+                  <installDir>${project.build.directory}/tomcat5</installDir>
+                </zipUrlInstaller>
+              </container>
+              <configuration>
+                <home>${project.build.directory}/tomcat5/container</home>
+              </configuration>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
   </profiles>
 </project>

Modified: myfaces/tobago/trunk/extension/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/pom.xml?rev=578671&r1=578670&r2=578671&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/extension/facelets/pom.xml Sun Sep 23 23:27:44 2007
@@ -35,7 +35,17 @@
   <build>
     
     <plugins>
-
+      <!--plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+          <encoding>UTF-8</encoding>
+          <showWarnings>true</showWarnings>
+        </configuration>
+      </plugin-->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>dependency-maven-plugin</artifactId>
@@ -127,6 +137,13 @@
       </plugin>
     </plugins>
   </build>
+  <repositories>
+    <repository>
+      <id>java.net</id>
+      <url>http://download.java.net/maven/1</url>
+      <layout>legacy</layout>
+    </repository>
+  </repositories>
   <dependencies>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
@@ -142,7 +159,7 @@
     <dependency>
       <groupId>com.sun.facelets</groupId>
       <artifactId>jsf-facelets</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.13</version>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>