accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1331560 - in /accumulo/branches/1.3: pom.xml src/assemble/install-thrift-jar.sh
Date Fri, 27 Apr 2012 19:54:16 GMT
Author: billie
Date: Fri Apr 27 19:54:16 2012
New Revision: 1331560

URL: http://svn.apache.org/viewvc?rev=1331560&view=rev
Log:
ACCUMULO-563 altered configuration of exec-maven-plugin

Modified:
    accumulo/branches/1.3/pom.xml
    accumulo/branches/1.3/src/assemble/install-thrift-jar.sh

Modified: accumulo/branches/1.3/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/pom.xml?rev=1331560&r1=1331559&r2=1331560&view=diff
==============================================================================
--- accumulo/branches/1.3/pom.xml (original)
+++ accumulo/branches/1.3/pom.xml Fri Apr 27 19:54:16 2012
@@ -315,37 +315,30 @@
         <artifactId>exec-maven-plugin</artifactId>
         <inherited>false</inherited>
         <version>1.2</version>
-        <configuration>
-          <executable>/bin/bash</executable>
-          <arguments>
-            <argument>docs/src/user_manual/build.sh</argument>
-          </arguments>
-        </configuration>
         <executions>
           <execution>
             <id>user-manual</id>
             <phase>prepare-package</phase>
+            <configuration>
+              <executable>/bin/bash</executable>
+              <arguments>
+                <argument>docs/src/user_manual/build.sh</argument>
+              </arguments>
+            </configuration>
             <goals>
               <goal>exec</goal>
             </goals>
           </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <inherited>false</inherited>
-        <version>1.2</version>
-        <configuration>
-          <executable>/bin/bash</executable>
-          <arguments>
-            <argument>src/assemble/install-thrift-jar.sh</argument>
-          </arguments>
-        </configuration>
-        <executions>
           <execution>
             <id>thrift-jar</id>
             <phase>generate-resources</phase>
+            <configuration>
+              <executable>/bin/bash</executable>
+              <arguments>
+                <argument>src/assemble/install-thrift-jar.sh</argument>
+                <argument>${maven.repo.local}</argument>
+              </arguments>
+            </configuration>
             <goals>
               <goal>exec</goal>
             </goals>

Modified: accumulo/branches/1.3/src/assemble/install-thrift-jar.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/assemble/install-thrift-jar.sh?rev=1331560&r1=1331559&r2=1331560&view=diff
==============================================================================
--- accumulo/branches/1.3/src/assemble/install-thrift-jar.sh (original)
+++ accumulo/branches/1.3/src/assemble/install-thrift-jar.sh Fri Apr 27 19:54:16 2012
@@ -33,7 +33,13 @@ runAt() {
   ( cd $1 ; echo in `pwd`; shift ; run $@ ) || fail 
 }
 
+LOCAL_MAVEN_REPO=$1
+
+if [ ! -z $LOCAL_MAVEN_REPO ] ; then
+  LOCAL_MAVEN_REPO="-Dmaven.repo.local=$LOCAL_MAVEN_REPO"
+fi
+
 run svn export https://svn.apache.org/repos/asf/thrift/tags/thrift-0.3.0
 runAt thrift-0.3.0/lib/java ant
-run mvn install:install-file -Dfile=thrift-0.3.0/lib/java/libthrift.jar -DgroupId=org.apache.accumulo.thrift
-DartifactId=libthrift -Dversion=0.3 -Dpackaging=jar
+run mvn install:install-file $LOCAL_MAVEN_REPO -Dfile=thrift-0.3.0/lib/java/libthrift.jar
-DgroupId=org.apache.accumulo.thrift -DartifactId=libthrift -Dversion=0.3 -Dpackaging=jar
 run rm -rf thrift-0.3.0



Mime
View raw message