diff options
| author | Christopher Tubbs <ctubbsii@apache.org> | 2020-05-04 14:20:27 +0200 |
|---|---|---|
| committer | Enrico Olivelli <eolivelli@apache.org> | 2020-05-04 14:20:27 +0200 |
| commit | 92f23ecd8159fd8d9c2fb8f34dd94f680ee6f712 (patch) | |
| tree | d7f283afc600626819f8b7fc88c4023e34c69b23 /zookeeper-client | |
| parent | bbe30290c2dd70bea20d3b08a0d705b10564c3b1 (diff) | |
| download | zookeeper-92f23ecd8159fd8d9c2fb8f34dd94f680ee6f712.tar.gz | |
ZOOKEEPER-3791: Miscellaneous Maven fixes
* Fix fatjar and full-build profile problems with redundant module
activation
* Remove "activeByDefault" profiles that don't do anything useful
* Make javadoc a bit quieter
* Fix assembly plugin warning about `/`
* Fix antrun warnings about tasks config renamed to target
* Fix docs module packaging (doesn't need to be jar)
* Fix zookeeper-it module by moving classes into standarad Maven
directory layout and configuring surefire plugin to find the tests
Author: Christopher Tubbs <ctubbsii@apache.org>
Reviewers: Enrico Olivelli <eolivelli@apache.org>, Norbert Kalmar <nkalmar@apache.org>
Closes #1314 from ctubbsii/misc-maven-fixes
Diffstat (limited to 'zookeeper-client')
| -rwxr-xr-x | zookeeper-client/pom.xml | 7 | ||||
| -rwxr-xr-x | zookeeper-client/zookeeper-client-c/pom.xml | 28 |
2 files changed, 12 insertions, 23 deletions
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml index 307d60583..d42256c61 100755 --- a/zookeeper-client/pom.xml +++ b/zookeeper-client/pom.xml @@ -24,7 +24,6 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> <version>3.7.0-SNAPSHOT</version> - <relativePath>..</relativePath> </parent> <artifactId>zookeeper-client</artifactId> @@ -39,10 +38,6 @@ <module>zookeeper-client-c</module> </modules> </profile> - <profile> - <id>java-build</id> - <modules /> - </profile> </profiles> <build> <plugins> @@ -55,4 +50,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml index e8ea1aa7a..b66712dcd 100755 --- a/zookeeper-client/zookeeper-client-c/pom.xml +++ b/zookeeper-client/zookeeper-client-c/pom.xml @@ -24,14 +24,17 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-client</artifactId> <version>3.7.0-SNAPSHOT</version> - <relativePath>..</relativePath> </parent> <artifactId>zookeeper-client-c</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <name>Apache ZooKeeper - Client - C</name> <description>ZooKeeper c client</description> + <properties> + <c-test-coverage-arg> </c-test-coverage-arg> + </properties> + <profiles> <profile> <id>c-test-coverage</id> @@ -39,15 +42,6 @@ <c-test-coverage-arg>--enable-gcov</c-test-coverage-arg> </properties> </profile> - <profile> - <id>no-c-test-coverage</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <c-test-coverage-arg> </c-test-coverage-arg> - </properties> - </profile> </profiles> <build> @@ -104,9 +98,9 @@ <id>generate-sources</id> <phase>generate-sources</phase> <configuration> - <tasks> + <target> <mkdir dir="target/c" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -116,7 +110,7 @@ <id>build-c-client</id> <phase>compile</phase> <configuration> - <tasks> + <target> <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};" /> @@ -125,7 +119,7 @@ <env key="base_dir" value="${basedir}/../.." /> <arg line="clean install" /> </exec> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -137,7 +131,7 @@ <configuration> <!-- do not run cpp tests if tests are globally skipped --> <skip>${skipTests}</skip> - <tasks> + <target> <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};" /> @@ -146,7 +140,7 @@ <env key="base_dir" value="${basedir}/../.." /> <arg line="check" /> </exec> - </tasks> + </target> </configuration> <goals> <goal>run</goal> |