You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2014/08/29 01:11:44 UTC
git commit: [HELIX-470] Netty-based IPC layer, fix pom
Repository: helix
Updated Branches:
refs/heads/master 9e9eacc4d -> 1b0d0e45f
[HELIX-470] Netty-based IPC layer, fix pom
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/1b0d0e45
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/1b0d0e45
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/1b0d0e45
Branch: refs/heads/master
Commit: 1b0d0e45f0ca0fc29c210a5339b4acf44865c36c
Parents: 9e9eacc
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Thu Aug 28 16:11:34 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Thu Aug 28 16:11:34 2014 -0700
----------------------------------------------------------------------
helix-ipc/pom.xml | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/1b0d0e45/helix-ipc/pom.xml
----------------------------------------------------------------------
diff --git a/helix-ipc/pom.xml b/helix-ipc/pom.xml
index e6b9e0b..4345751 100644
--- a/helix-ipc/pom.xml
+++ b/helix-ipc/pom.xml
@@ -35,13 +35,13 @@ under the License.
javax.management*,
org.apache.commons.math*;version="[2.1,3)",
org.apache.log4j*;version="[1.2,2)",
- org.restlet;version="[2.1.4,3]",
*
</osgi.import>
<osgi.ignore>
org.apache.helix.tools*
</osgi.ignore>
- <osgi.export>org.apache.helix*;version="${project.version};-noimport:=true</osgi.export>
+ <osgi.export>org.apache.helix.ipc*;version="${project.version};-noimport:=true</osgi.export>
+ <osgi.export>org.apache.helix.resolver*;version="${project.version};-noimport:=true</osgi.export>
</properties>
<dependencies>
@@ -78,6 +78,7 @@ under the License.
</dependency>
</dependencies>
<build>
+ <!--
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
@@ -85,11 +86,9 @@ under the License.
</resource>
<resource>
<directory>${basedir}</directory>
- <includes>
- <include>DISCLAIMER</include>
- </includes>
</resource>
</resources>
+ -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -107,10 +106,6 @@ under the License.
<artifactId>appassembler-maven-plugin</artifactId>
<configuration>
<programs>
- <program>
- <mainClass>org.apache.helix.ipc.netty.NettyHelixIPCService</mainClass>
- <name>netty-helix-ipc-service</name>
- </program>
</programs>
</configuration>
</plugin>
@@ -118,14 +113,14 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <!--
<descriptors>
<descriptor>src/assemble/assembly.xml</descriptor>
</descriptors>
- -->
+ <!--
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
+ -->
</configuration>
<executions>
<execution>