You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by bi...@apache.org on 2010/03/11 23:49:07 UTC

svn commit: r922049 - in /lucene/mahout/trunk: collections/pom.xml math/pom.xml maven/pom.xml pom.xml

Author: bimargulies
Date: Thu Mar 11 22:49:07 2010
New Revision: 922049

URL: http://svn.apache.org/viewvc?rev=922049&view=rev
Log:
1) Distinguish a 'release' profile, which means 'don't run tests, do make source and javadoc' from
release_perform, meaning 'actually build the bundles.' There's a better way to do this, but not
for tonight.

2) declare an explicit dependency from collections to its generator.

3) cosmetic improvement to math pom.

More after dinner.

Modified:
    lucene/mahout/trunk/collections/pom.xml
    lucene/mahout/trunk/math/pom.xml
    lucene/mahout/trunk/maven/pom.xml
    lucene/mahout/trunk/pom.xml

Modified: lucene/mahout/trunk/collections/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/collections/pom.xml?rev=922049&r1=922048&r2=922049&view=diff
==============================================================================
--- lucene/mahout/trunk/collections/pom.xml (original)
+++ lucene/mahout/trunk/collections/pom.xml Thu Mar 11 22:49:07 2010
@@ -93,6 +93,11 @@
 
   <dependencies>
     <dependency>
+        <groupId>org.apache.mahout</groupId>
+        <artifactId>mahout-collection-codegen-plugin</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>1.5.8</version>

Modified: lucene/mahout/trunk/math/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/pom.xml?rev=922049&r1=922048&r2=922049&view=diff
==============================================================================
--- lucene/mahout/trunk/math/pom.xml (original)
+++ lucene/mahout/trunk/math/pom.xml Thu Mar 11 22:49:07 2010
@@ -61,6 +61,7 @@
             <goals>
               <goal>test-jar</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>

Modified: lucene/mahout/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/maven/pom.xml?rev=922049&r1=922048&r2=922049&view=diff
==============================================================================
--- lucene/mahout/trunk/maven/pom.xml (original)
+++ lucene/mahout/trunk/maven/pom.xml Thu Mar 11 22:49:07 2010
@@ -321,6 +321,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.5</version>
         <configuration>
           <forkMode>once</forkMode>
           <argLine>-Xms256m -Xmx512m</argLine>
@@ -352,6 +353,14 @@
       <build>
         <plugins>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.5</version>
+            <configuration>
+              <skipTests>true</skipTests>
+            </configuration>
+          </plugin>
+          <plugin>
             <inherited>true</inherited>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>

Modified: lucene/mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=922049&r1=922048&r2=922049&view=diff
==============================================================================
--- lucene/mahout/trunk/pom.xml (original)
+++ lucene/mahout/trunk/pom.xml Thu Mar 11 22:49:07 2010
@@ -37,6 +37,24 @@
 
   <build>
     <defaultGoal>install</defaultGoal>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.0-beta-9</version>
+                    <configuration>
+                        <useReleaseProfile>true</useReleaseProfile>
+                        <releaseProfiles>release</releaseProfiles>
+                        <remoteTagging>true</remoteTagging>
+                        <preparationGoals>clean install</preparationGoals>
+                        <goals>deploy</goals>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -69,10 +87,11 @@
 
   <profiles>
     <profile>
-      <id>release</id>
+<!-- Since this executes the release packaging, we won't want it in release:prepare! -->
+      <id>release_perform</id>
       <build>
         <plugins>
-          <plugin>
+            <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
 	    <version>2.2-beta-5</version>
             <executions>