Repository: incubator-ratis
Updated Branches:
  refs/heads/master 22b70e9c4 -> 830bd615d


Revert "RATIS-129. Compile protobuf and shade if the shaded source directory is 
missing."

This reverts commit 6d0d114ff4a8709dd568b5227dbc6c78cbcd8d1f.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/830bd615
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/830bd615
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/830bd615

Branch: refs/heads/master
Commit: 830bd615dbcaa1db7c47b6f65bc68adbffc91289
Parents: 22b70e9
Author: Tsz-Wo Nicholas Sze <[email protected]>
Authored: Wed Nov 8 14:32:07 2017 -0800
Committer: Tsz-Wo Nicholas Sze <[email protected]>
Committed: Wed Nov 8 14:34:03 2017 -0800

----------------------------------------------------------------------
 BUILDING.md                 | 7 +++++--
 ratis-hadoop-shaded/pom.xml | 6 +++---
 ratis-proto-shaded/pom.xml  | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/830bd615/BUILDING.md
----------------------------------------------------------------------
diff --git a/BUILDING.md b/BUILDING.md
index 65585aa..3017be5 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -42,8 +42,11 @@ ratis-hadoop-shaded/src/main/java/
 ```
 They are not checked-in to git though.
 
-Protobuf compilation and shading are triggered
-when the corresponding shaded source directory is missing.
+By default protobuf compilation and shading are triggered at every build. To 
make more faster the
+additional builds, you can turn them off:
+```
+$ mvn package -DskipTests -DskipShade
+```
 
 During the clean lifecycle all the shaded classes are also deleted. You can 
clean the
 compiled files but keep the shaded classes with the following command:

http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/830bd615/ratis-hadoop-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/ratis-hadoop-shaded/pom.xml b/ratis-hadoop-shaded/pom.xml
index 8f9528b..7fca43e 100644
--- a/ratis-hadoop-shaded/pom.xml
+++ b/ratis-hadoop-shaded/pom.xml
@@ -167,9 +167,9 @@
          Shade and drop the generated java files under src/main/java.
       -->
       <activation>
-        <file>
-          <missing>${shaded.sources.dir}</missing>
-        </file>
+        <property>
+          <name>!skipShade</name>
+        </property>
       </activation>
       <properties>
         <profile.id>compile-protobuf</profile.id>

http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/830bd615/ratis-proto-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/ratis-proto-shaded/pom.xml b/ratis-proto-shaded/pom.xml
index 8244239..4add72c 100644
--- a/ratis-proto-shaded/pom.xml
+++ b/ratis-proto-shaded/pom.xml
@@ -466,9 +466,9 @@
          files or update the protobuf version.
       -->
       <activation>
-        <file>
-          <missing>${shaded.sources.dir}</missing>
-        </file>
+        <property>
+          <name>!skipShade</name>
+        </property>
       </activation>
       <properties>
         <profile.id>compile-protobuf</profile.id>

Reply via email to