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 2006/01/22 16:14:33 UTC

svn commit: r371316 - in /myfaces/tomahawk/trunk: assembly/pom.xml assembly/src/main/assembly/dep.xml core/pom.xml examples/assembly/pom.xml examples/assembly/src/main/assembly/dep.xml examples/tiles/pom.xml

Author: bommel
Date: Sun Jan 22 07:14:24 2006
New Revision: 371316

URL: http://svn.apache.org/viewcvs?rev=371316&view=rev
Log:
declare struts.jar in tomahawk optional added dependency to struts.jar in titles example
added scm url in wagon-maven-plugin pom
remove bz2 archives from assembly descriptors
change url for nighly builds

Modified:
    myfaces/tomahawk/trunk/assembly/pom.xml
    myfaces/tomahawk/trunk/assembly/src/main/assembly/dep.xml
    myfaces/tomahawk/trunk/core/pom.xml
    myfaces/tomahawk/trunk/examples/assembly/pom.xml
    myfaces/tomahawk/trunk/examples/assembly/src/main/assembly/dep.xml
    myfaces/tomahawk/trunk/examples/tiles/pom.xml

Modified: myfaces/tomahawk/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/assembly/pom.xml?rev=371316&r1=371315&r2=371316&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/assembly/pom.xml (original)
+++ myfaces/tomahawk/trunk/assembly/pom.xml Sun Jan 22 07:14:24 2006
@@ -119,7 +119,7 @@
         <version>1.0-SNAPSHOT</version>
         <configuration>
           <id>myfaces-nightly-builds</id>
-          <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/</url>
+          <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/nightly</url>
           <inputDirectory>target/assembly/out</inputDirectory>
         </configuration>
       </plugin>

Modified: myfaces/tomahawk/trunk/assembly/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/assembly/src/main/assembly/dep.xml?rev=371316&r1=371315&r2=371316&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/assembly/src/main/assembly/dep.xml (original)
+++ myfaces/tomahawk/trunk/assembly/src/main/assembly/dep.xml Sun Jan 22 07:14:24 2006
@@ -1,7 +1,6 @@
 <assembly>
   <id>bin</id>
   <formats>
-    <format>tar.bz2</format>
     <format>tar.gz</format>
     <format>zip</format>
   </formats>

Modified: myfaces/tomahawk/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/pom.xml?rev=371316&r1=371315&r2=371316&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/core/pom.xml Sun Jan 22 07:14:24 2006
@@ -56,13 +56,6 @@
       <scope>compile</scope>
     </dependency>
 
-    <!--dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
-      <scope>compile</scope>
-    </dependency-->
-
     <dependency>
       <groupId>portlet-api</groupId>
       <artifactId>portlet-api</artifactId>
@@ -75,6 +68,7 @@
       <artifactId>struts</artifactId>
       <version>1.2.8</version>
       <scope>compile</scope>
+      <optional>true</optional>
     </dependency>
 
     <dependency>

Modified: myfaces/tomahawk/trunk/examples/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/assembly/pom.xml?rev=371316&r1=371315&r2=371316&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/assembly/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/assembly/pom.xml Sun Jan 22 07:14:24 2006
@@ -77,7 +77,7 @@
         <version>1.0-SNAPSHOT</version>
         <configuration>
           <id>myfaces-nightly-builds</id>
-          <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/</url>
+          <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/nightly</url>
           <inputDirectory>target/assembly/out</inputDirectory>
         </configuration>
       </plugin>

Modified: myfaces/tomahawk/trunk/examples/assembly/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/assembly/src/main/assembly/dep.xml?rev=371316&r1=371315&r2=371316&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/assembly/src/main/assembly/dep.xml (original)
+++ myfaces/tomahawk/trunk/examples/assembly/src/main/assembly/dep.xml Sun Jan 22 07:14:24 2006
@@ -1,7 +1,6 @@
 <assembly>
   <id>bin</id>
   <formats>
-    <format>tar.bz2</format>
     <format>tar.gz</format>
     <format>zip</format>
   </formats>

Modified: myfaces/tomahawk/trunk/examples/tiles/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/tiles/pom.xml?rev=371316&r1=371315&r2=371316&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/tiles/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/tiles/pom.xml Sun Jan 22 07:14:24 2006
@@ -37,4 +37,19 @@
     <finalName>myfaces-example-tiles</finalName>
   </build>
 
+  <dependencies>
+    <dependency>
+       <groupId>struts</groupId>
+       <artifactId>struts</artifactId>
+       <version>1.2.8</version>
+       <scope>compile</scope>
+       <!--exclusions>
+        <exclusion>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
+        </exclusion>
+      </exclusions-->
+     </dependency>
+   </dependencies>
+
 </project>