You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2014/01/30 21:58:11 UTC
[2/3] git commit: The apollo-broker-service.exe needs to move to the
broker.jar since thats' the module that extracts it.
The apollo-broker-service.exe needs to move to the broker.jar since thats' the module that extracts it.
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/feb2a176
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/feb2a176
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/feb2a176
Branch: refs/heads/trunk
Commit: feb2a176b99f54f847e7064d81985d60a68bcd6d
Parents: fcb7068
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Thu Jan 30 15:23:37 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Thu Jan 30 15:23:37 2014 -0500
----------------------------------------------------------------------
apollo-broker/pom.xml | 37 +++++++++++++++++++++++++++++++++++++
apollo-cli/pom.xml | 37 -------------------------------------
2 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/feb2a176/apollo-broker/pom.xml
----------------------------------------------------------------------
diff --git a/apollo-broker/pom.xml b/apollo-broker/pom.xml
index a828b9d..ab1f70c 100644
--- a/apollo-broker/pom.xml
+++ b/apollo-broker/pom.xml
@@ -101,6 +101,16 @@
<optional>true</optional>
</dependency>
+ <!-- -->
+ <dependency>
+ <groupId>com.sun.winsw</groupId>
+ <artifactId>winsw</artifactId>
+ <version>1.9</version>
+ <classifier>bin</classifier>
+ <type>exe</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- Scala Support -->
<dependency>
<groupId>org.scala-lang</groupId>
@@ -187,6 +197,33 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.sun.winsw</groupId>
+ <artifactId>winsw</artifactId>
+ <version>1.9</version>
+ <classifier>bin</classifier>
+ <type>exe</type>
+ <outputDirectory>${basedir}/target/classes/org/apache/activemq/apollo/broker/bin</outputDirectory>
+ <destFileName>apollo-broker-service.exe</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/feb2a176/apollo-cli/pom.xml
----------------------------------------------------------------------
diff --git a/apollo-cli/pom.xml b/apollo-cli/pom.xml
index 4443430..652478c 100644
--- a/apollo-cli/pom.xml
+++ b/apollo-cli/pom.xml
@@ -87,15 +87,6 @@
</dependency>
<dependency>
- <groupId>com.sun.winsw</groupId>
- <artifactId>winsw</artifactId>
- <version>1.9</version>
- <classifier>bin</classifier>
- <type>exe</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
@@ -233,34 +224,6 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.sun.winsw</groupId>
- <artifactId>winsw</artifactId>
- <version>1.9</version>
- <classifier>bin</classifier>
- <type>exe</type>
- <outputDirectory>${basedir}/target/classes/org/apache/activemq/apollo/cli/commands/bin</outputDirectory>
- <destFileName>apollo-broker-service.exe</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.1.1</version>