helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject git commit: fix apache-release profile for building sources release
Date Tue, 30 Oct 2012 14:05:45 GMT
Updated Branches:
  refs/heads/master eb728cb2c -> 91655a22b


fix apache-release profile for building sources release


Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/91655a22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/91655a22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/91655a22

Branch: refs/heads/master
Commit: 91655a22b8247c42c6740bca35dc1490282859a7
Parents: eb728cb
Author: olivier lamy <olamy@apache.org>
Authored: Tue Oct 30 15:05:34 2012 +0100
Committer: olivier lamy <olamy@apache.org>
Committed: Tue Oct 30 15:05:34 2012 +0100

----------------------------------------------------------------------
 helix-admin-webapp/pom.xml           |   10 +++++++++-
 helix-core/pom.xml                   |   17 +++++++++++++++++
 helix-core/src/assemble/assembly.xml |    4 ++--
 pom.xml                              |    8 --------
 4 files changed, 28 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/91655a22/helix-admin-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
index 513463e..66be534 100644
--- a/helix-admin-webapp/pom.xml
+++ b/helix-admin-webapp/pom.xml
@@ -93,13 +93,21 @@ under the License.
 
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
             <descriptor>src/assemble/assembly.xml</descriptor>
           </descriptors>
         </configuration>
-
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/91655a22/helix-core/pom.xml
----------------------------------------------------------------------
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index c1a3bc8..aa51168 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -185,6 +185,23 @@ under the License.
           </programs>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assemble/assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/91655a22/helix-core/src/assemble/assembly.xml
----------------------------------------------------------------------
diff --git a/helix-core/src/assemble/assembly.xml b/helix-core/src/assemble/assembly.xml
index 50faf7c..cda6a52 100644
--- a/helix-core/src/assemble/assembly.xml
+++ b/helix-core/src/assemble/assembly.xml
@@ -24,13 +24,13 @@ under the License.
 	</formats>
 	<fileSets>
 		<fileSet>
-			<directory>target/cluster-manager-pkg/bin</directory>
+			<directory>${project.build.directory}/${project.artifactId}-pkg/bin</directory>
 			<outputDirectory>/bin</outputDirectory>
 			<lineEnding>unix</lineEnding>
 			<fileMode>0744</fileMode>
 		</fileSet>
 		<fileSet>
-			<directory>target/cluster-manager-pkg/repo</directory>
+			<directory>${project.build.directory}/${project.artifactId}-pkg/repo</directory>
 			<outputDirectory>/repo</outputDirectory>
 		</fileSet>
 		<!-- <fileSet> <directory>src/main/conf</directory> <includes>
<include>app-env.bat</include> 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/91655a22/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0b29896..606fd53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,14 +196,6 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>2.3</version>
-          <executions>
-            <execution>
-              <phase>package</phase>
-              <goals>
-                <goal>single</goal>
-              </goals>
-            </execution>
-          </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>


Mime
View raw message