nkalmar closed pull request #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226
URL: https://github.com/apache/zookeeper/pull/759
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index ec53dff518..09b80cfa1a 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 a8a92c5457..37a5074b6c 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 63818ca632..4a6b78305f 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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
