This is an automated email from the ASF dual-hosted git repository.
phunt pushed a commit to branch release-3.6.1
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/release-3.6.1 by this push:
new 642bb21 ZOOKEEPER-3797: Conflict between fatjar and full-build Maven
profiles
642bb21 is described below
commit 642bb2198b62711b5ec4fff0b67015eb807f8157
Author: Enrico Olivelli <[email protected]>
AuthorDate: Sat Apr 18 10:03:14 2020 -0700
ZOOKEEPER-3797: Conflict between fatjar and full-build Maven profiles
Enable fatjar module in full-build profile.
This is a fix only for branch-3.6, on master branch maven structure is
changing, there is no need for this fix
Author: Enrico Olivelli <[email protected]>
Reviewers: [email protected], [email protected]
Closes #1323 from eolivelli/fix/ZOOKEEPER-3797 and squashes the following
commits:
6dc3270fb [Enrico Olivelli] skip checkstyle
1cff2ff85 [Enrico Olivelli] skip spotbugs
19a869959 [Enrico Olivelli] simplify skipTests
e48811917 [Enrico Olivelli] skip tests in zookeeper-it
3d6dc500b [Enrico Olivelli] enable zookeeper-it
940aec8da [Enrico Olivelli] ZOOKEEPER-3797 Conflict between fatjar and
full-build Maven profiles in branch-3.6
Change-Id: Ifbfc6d1ac63a9eeab399a1fcd575b81185b36fc3
(cherry picked from commit c5b4c235fdd4abc6d4ebda2d40eb76d9452a417e)
Signed-off-by: Patrick Hunt <[email protected]>
---
pom.xml | 1 +
zookeeper-contrib/pom.xml | 6 ++++++
zookeeper-it/pom.xml | 11 +++++++++++
3 files changed, 18 insertions(+)
diff --git a/pom.xml b/pom.xml
index 39e01b0..25debe0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -258,6 +258,7 @@
<profile>
<id>full-build</id>
<modules>
+ <module>zookeeper-it</module>
<module>zookeeper-contrib</module>
</modules>
</profile>
diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml
index c26849f..f520fe4 100755
--- a/zookeeper-contrib/pom.xml
+++ b/zookeeper-contrib/pom.xml
@@ -48,6 +48,12 @@
<module>zookeeper-contrib-fatjar</module>
</modules>
</profile>
+ <profile>
+ <id>full-build</id>
+ <modules>
+ <module>zookeeper-contrib-fatjar</module>
+ </modules>
+ </profile>
</profiles>
<build>
diff --git a/zookeeper-it/pom.xml b/zookeeper-it/pom.xml
index f113456..72e5918 100755
--- a/zookeeper-it/pom.xml
+++ b/zookeeper-it/pom.xml
@@ -33,6 +33,17 @@
ZooKeeper system tests
</description>
+ <profiles>
+ <profile>
+ <id>full-build</id>
+ <properties>
+ <skipTests>true</skipTests>
+ <spotbugs.skip>true</spotbugs.skip>
+ <checkstyle.skip>true</checkstyle.skip>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
