svn commit: r428959 - in /myfaces/tomahawk/branches/1_1_4: assembly/pom.xml pom.xml

[ws...@apache.org]

Author: wsmoak
Date: Fri Aug  4 22:02:23 2006
New Revision: 428959

URL: http://svn.apache.org/viewvc?rev=428959&view=rev
Log:
Add a <distributionManagement> section to override the incorrect information coming from the master pom.
Set the <repository> so that even after the version number is changed to omit -SNAPSHOT, 'mvn deploy' will *not* publish jars to the official release repo by default.
Comment out the wagon plugin, which can't be found in any repository and doesn't seem to be necessary for the branch.

Modified:
    myfaces/tomahawk/branches/1_1_4/assembly/pom.xml
    myfaces/tomahawk/branches/1_1_4/pom.xml

Modified: myfaces/tomahawk/branches/1_1_4/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_1_4/assembly/pom.xml?rev=428959&r1=428958&r2=428959&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_4/assembly/pom.xml (original)
+++ myfaces/tomahawk/branches/1_1_4/assembly/pom.xml Fri Aug  4 22:02:23 2006
@@ -127,7 +127,7 @@
         </configuration>
       </plugin>
 
-       <plugin>
+       <!--plugin>
         <groupId>org.apache.myfaces.maven</groupId>
         <artifactId>wagon-maven-plugin</artifactId>
         <version>1.0.4-SNAPSHOT</version>
@@ -136,7 +136,7 @@
           <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/nightly</url>
           <inputDirectory>target/assembly/out</inputDirectory>
         </configuration>
-      </plugin>
+      </plugin-->
 
     </plugins>
 

Modified: myfaces/tomahawk/branches/1_1_4/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_1_4/pom.xml?rev=428959&r1=428958&r2=428959&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_4/pom.xml (original)
+++ myfaces/tomahawk/branches/1_1_4/pom.xml Fri Aug  4 22:02:23 2006
@@ -32,14 +32,14 @@
 
   <repositories>
     <repository>
-        <releases>
+      <id>apache.snapshots</id>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <releases>
           <enabled>false</enabled>
         </releases>
         <snapshots>
           <enabled>true</enabled>
         </snapshots>
-      <id>apache-maven-snapshots</id>
-      <url>http://cvs.apache.org/maven-snapshot-repository</url>
     </repository>
   </repositories>
 
@@ -48,5 +48,19 @@
     <module>examples</module>
     <module>sandbox</module>
   </modules>
+  
+  <distributionManagement>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Maven Snapshot (and Test Build) Repository</name>
+      <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+    </repository>
+    <snapshotRepository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>apache.snapshots</id>
+      <name>Apache Maven Snapshot Repository</name>
+      <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+    </snapshotRepository>
+  </distributionManagement>
 
 </project>