You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2019/01/08 16:26:08 UTC
[zookeeper] branch branch-3.5 updated: ZOOKEEPER-3226: MAVEN
MIGRATION - 3.5 -
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new 5cb2047 ZOOKEEPER-3226: MAVEN MIGRATION - 3.5 -
5cb2047 is described below
commit 5cb204728d57ab966413fb9e3e76f7c65e98ae9e
Author: Norbert Kalmar <nk...@yahoo.com>
AuthorDate: Tue Jan 8 17:25:51 2019 +0100
ZOOKEEPER-3226: MAVEN MIGRATION - 3.5 -
Author: Norbert Kalmar <nkalmaryahoo.com>
Reviewers: andorapache.org
Closes #741 from nkalmar/ZOOKEEPER-3226
Author: Norbert Kalmar <nk...@yahoo.com>
Reviewers: andor@apache.org
Closes #758 from nkalmar/ZK-3226-3.5
---
pom.xml | 12 ++
zookeeper-client/pom.xml | 17 ++-
zookeeper-client/zookeeper-client-c/pom.xml | 225 +++++++++++++---------------
3 files changed, 130 insertions(+), 124 deletions(-)
diff --git a/pom.xml b/pom.xml
index 95b85a1..719e69a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -237,6 +237,18 @@
</developer>
</developers>
+ <profiles>
+ <profile>
+ <id>full-build</id>
+ </profile>
+ <profile>
+ <id>java-build</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
+
<properties>
<!-- maven properties -->
<maven.compiler.source>1.8</maven.compiler.source>
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml
index cc0da97..a1eda68 100755
--- a/zookeeper-client/pom.xml
+++ b/zookeeper-client/pom.xml
@@ -33,8 +33,19 @@
<name>Apache ZooKeeper - Client</name>
<description>ZooKeeper client</description>
- <modules>
- <module>zookeeper-client-c</module>
- </modules>
+
+
+ <profiles>
+ <profile>
+ <id>full-build</id>
+ <modules>
+ <module>zookeeper-client-c</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>java-build</id>
+ <modules />
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml
index 4dc985b..84235ea 100755
--- a/zookeeper-client/zookeeper-client-c/pom.xml
+++ b/zookeeper-client/zookeeper-client-c/pom.xml
@@ -33,126 +33,109 @@
<name>Apache ZooKeeper - Client - C</name>
<description>ZooKeeper c client</description>
- <profiles>
- <profile>
- <id>linux</id>
- <activation>
- <os>
- <family>unix</family>
- <name>Linux</name>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <mkdir dir="target/c" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>test-cppunit</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <exec dir="${basedir}/target/c" executable="make" failonerror="true">
- <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};/usr/lib" />
- <env key="PATH" path="${env.PATH};${basedir};" />
- <env key="CALLER" value="ANT" />
- <env key="CLOVER_HOME" value="${basedir}/../../zookeeper-server/target" />
- <env key="base_dir" value="${basedir}/../.." />
- <arg line="clean check" />
- </exec>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>autoreconf</id>
- <phase>test-compile</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <workingDirectory>${project.basedir}</workingDirectory>
- <executable>autoreconf</executable>
- <environmentVariables>
- <ACLOCAL>aclocal -I /usr/share/aclocal</ACLOCAL>
- </environmentVariables>
- <arguments>
- <argument>-if</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>configure</id>
- <phase>test-compile</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <workingDirectory>${project.build.directory}/c</workingDirectory>
- <executable>${project.basedir}/configure</executable>
- <environmentVariables>
- <base_dir>${project.basedir}/../..</base_dir>
- <CALLER>ANT</CALLER>
- </environmentVariables>
- <arguments>
- <argument>--prefix=${project.build.directory}/c</argument>
- <argument>--enable-gcov</argument>
- </arguments>
- </configuration>
- </execution>
- <!--execution> TODO: Why is this not working?!
- <id>test-cppunit</id>
- <phase>test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <workingDirectory>${project.build.directory}/c</workingDirectory>
- <executable>make</executable>
- <environmentVariables>
- <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH};/usr/lib</LD_LIBRARY_PATH>
- <PATH>${env.PATH};${project.basedir};</PATH>
- <CALLER>ANT</CALLER>
- <CLOVER_HOME></CLOVER_HOME>
- <base_dir>${project.basedir}/../..</base_dir>
- </environmentVariables>
- <arguments>
- <argument>clean check</argument>
- </arguments>
- </configuration>
- </execution-->
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>non-linux</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="target/c" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test-cppunit</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <exec dir="${basedir}/target/c" executable="make" failonerror="true">
+ <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};/usr/lib" />
+ <env key="PATH" path="${env.PATH};${basedir};" />
+ <env key="CALLER" value="ANT" />
+ <env key="CLOVER_HOME" value="${basedir}/../../zookeeper-server/target" />
+ <env key="base_dir" value="${basedir}/../.." />
+ <arg line="clean check" />
+ </exec>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>autoreconf</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${project.basedir}</workingDirectory>
+ <executable>autoreconf</executable>
+ <environmentVariables>
+ <ACLOCAL>aclocal -I /usr/share/aclocal</ACLOCAL>
+ </environmentVariables>
+ <arguments>
+ <argument>-if</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>configure</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${project.build.directory}/c</workingDirectory>
+ <executable>${project.basedir}/configure</executable>
+ <environmentVariables>
+ <base_dir>${project.basedir}/../..</base_dir>
+ <CALLER>ANT</CALLER>
+ </environmentVariables>
+ <arguments>
+ <argument>--prefix=${project.build.directory}/c</argument>
+ <argument>--enable-gcov</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <!--execution> TODO: Why is this not working?!
+ <id>test-cppunit</id>
+ <phase>test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${project.build.directory}/c</workingDirectory>
+ <executable>make</executable>
+ <environmentVariables>
+ <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH};/usr/lib</LD_LIBRARY_PATH>
+ <PATH>${env.PATH};${project.basedir};</PATH>
+ <CALLER>ANT</CALLER>
+ <CLOVER_HOME></CLOVER_HOME>
+ <base_dir>${project.basedir}/../..</base_dir>
+ </environmentVariables>
+ <arguments>
+ <argument>clean check</argument>
+ </arguments>
+ </configuration>
+ </execution-->
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file