You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ju...@apache.org on 2020/03/08 04:16:11 UTC

[bigtop] branch master updated: BIGTOP-3306. Bump Giraph to 1.2.0

This is an automated email from the ASF dual-hosted git repository.

junhe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 1557332  BIGTOP-3306. Bump Giraph to 1.2.0
1557332 is described below

commit 1557332463a28f9d48799b0dc08876c564cb24b6
Author: Kengo Seki <se...@apache.org>
AuthorDate: Sat Feb 15 14:14:28 2020 +0900

    BIGTOP-3306. Bump Giraph to 1.2.0
---
 .../src/common/giraph/patch1-remove-findbugs.diff  | 324 ++++++++++++++++++---
 .../src/common/giraph/patch2-fix-pom.diff          |  21 ++
 bigtop.bom                                         |   2 +-
 3 files changed, 301 insertions(+), 46 deletions(-)

diff --git a/bigtop-packages/src/common/giraph/patch1-remove-findbugs.diff b/bigtop-packages/src/common/giraph/patch1-remove-findbugs.diff
index 33090e2..8ec6d79 100644
--- a/bigtop-packages/src/common/giraph/patch1-remove-findbugs.diff
+++ b/bigtop-packages/src/common/giraph/patch1-remove-findbugs.diff
@@ -1,6 +1,6 @@
-diff -ur giraph-1.1.0/giraph-accumulo/pom.xml giraph-1.1.0.new/giraph-accumulo/pom.xml
---- giraph-1.1.0/giraph-accumulo/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-accumulo/pom.xml	2016-12-22 19:16:52.000000000 +0100
+diff -ur giraph-1.2.0/giraph-accumulo/pom.xml giraph-1.2.0.new/giraph-accumulo/pom.xml
+--- giraph-1.2.0/giraph-accumulo/pom.xml	2016-10-12 08:53:13.000000000 +0900
++++ giraph-1.2.0.new/giraph-accumulo/pom.xml	2020-02-15 08:49:31.000000000 +0900
 @@ -76,10 +76,6 @@
            </systemProperties>
          </configuration>
@@ -12,10 +12,185 @@ diff -ur giraph-1.1.0/giraph-accumulo/pom.xml giraph-1.1.0.new/giraph-accumulo/p
      </plugins>
    </build>
  
-diff -ur giraph-1.1.0/giraph-core/pom.xml giraph-1.1.0.new/giraph-core/pom.xml
---- giraph-1.1.0/giraph-core/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-core/pom.xml	2016-12-22 19:17:12.000000000 +0100
-@@ -142,24 +142,6 @@
+diff -ur giraph-1.2.0/giraph-block-app/pom.xml giraph-1.2.0.new/giraph-block-app/pom.xml
+--- giraph-1.2.0/giraph-block-app/pom.xml	2016-10-12 08:53:13.000000000 +0900
++++ giraph-1.2.0.new/giraph-block-app/pom.xml	2020-02-15 09:10:29.000000000 +0900
+@@ -77,10 +77,6 @@
+           </systemProperties>
+         </configuration>
+       </plugin>
+-      <plugin>
+-        <groupId>org.codehaus.mojo</groupId>
+-        <artifactId>findbugs-maven-plugin</artifactId>
+-      </plugin>
+     </plugins>
+   </build>
+ 
+@@ -110,10 +106,6 @@
+       <groupId>log4j</groupId>
+       <artifactId>log4j</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>com.google.code.findbugs</groupId>
+-      <artifactId>annotations</artifactId>
+-    </dependency>
+ 
+     <!-- runtime dependency -->
+     <dependency>
+diff -ur giraph-1.2.0/giraph-block-app/src/main/java/org/apache/giraph/block_app/library/gc/WorkerGCPiece.java giraph-1.2.0.new/giraph-block-app/src/main/java/org/apache/giraph/block_app/library/gc/WorkerGCPiece.java
+--- giraph-1.2.0/giraph-block-app/src/main/java/org/apache/giraph/block_app/library/gc/WorkerGCPiece.java	2015-12-02 04:51:44.000000000 +0900
++++ giraph-1.2.0.new/giraph-block-app/src/main/java/org/apache/giraph/block_app/library/gc/WorkerGCPiece.java	2020-02-15 09:05:44.000000000 +0900
+@@ -23,8 +23,6 @@
+ import org.apache.hadoop.io.Writable;
+ import org.apache.hadoop.io.WritableComparable;
+ 
+-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+-
+ /**
+  * Dummy piece to hint System.gc()
+  */
+@@ -32,7 +30,6 @@
+     Writable, Writable, NoMessage, Object, NoMessage, Object>  {
+ 
+   @Override
+-  @SuppressFBWarnings(value = "DM_GC")
+   public void workerContextSend(
+       BlockWorkerContextSendApi<WritableComparable, NoMessage> workerContextApi,
+       Object executionStage,
+diff -ur giraph-1.2.0/giraph-block-app/src/main/java/org/apache/giraph/object/MultiSizedReusable.java giraph-1.2.0.new/giraph-block-app/src/main/java/org/apache/giraph/object/MultiSizedReusable.java
+--- giraph-1.2.0/giraph-block-app/src/main/java/org/apache/giraph/object/MultiSizedReusable.java	2015-12-02 04:45:59.000000000 +0900
++++ giraph-1.2.0.new/giraph-block-app/src/main/java/org/apache/giraph/object/MultiSizedReusable.java	2020-02-15 09:05:58.000000000 +0900
+@@ -25,8 +25,6 @@
+ 
+ import com.google.common.base.Preconditions;
+ 
+-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+-
+ /**
+  * Holds reusable objects of multiple sizes.
+  * Example usecase, is when we need a hashmap - that we will insert and iterate
+@@ -43,7 +41,6 @@
+   private final Int2ObjFunction<T> createSized;
+   private final Consumer<T> init;
+   @SuppressWarnings("unchecked")
+-  @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+   private final transient T[] holder = (T[]) new Object[Integer.SIZE];
+ 
+   // No-arg constructor Kryo can call to initialize holder
+diff -ur giraph-1.2.0/giraph-block-app-8/pom.xml giraph-1.2.0.new/giraph-block-app-8/pom.xml
+--- giraph-1.2.0/giraph-block-app-8/pom.xml	2016-10-12 08:53:13.000000000 +0900
++++ giraph-1.2.0.new/giraph-block-app-8/pom.xml	2020-02-15 09:08:36.000000000 +0900
+@@ -90,10 +90,6 @@
+           </systemProperties>
+         </configuration>
+       </plugin>
+-      <plugin>
+-        <groupId>org.codehaus.mojo</groupId>
+-        <artifactId>findbugs-maven-plugin</artifactId>
+-      </plugin>
+     </plugins>
+   </build>
+ 
+diff -ur giraph-1.2.0/giraph-core/pom.xml giraph-1.2.0.new/giraph-core/pom.xml
+--- giraph-1.2.0/giraph-core/pom.xml	2016-10-12 08:53:13.000000000 +0900
++++ giraph-1.2.0.new/giraph-core/pom.xml	2020-02-15 09:09:01.000000000 +0900
+@@ -138,24 +138,6 @@
+           </execution>
+         </executions>
+       </plugin>
+-      <plugin>
+-        <groupId>org.codehaus.mojo</groupId>
+-        <artifactId>findbugs-maven-plugin</artifactId>
+-        <version>3.0.0</version>
+-        <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <findbugsXmlOutput>false</findbugsXmlOutput>
+-          <excludeFilterFile>${top.dir}/findbugs-exclude.xml</excludeFilterFile>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <phase>verify</phase>
+-            <goals>
+-              <goal>check</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+     </plugins>
+   </build>
+ 
+@@ -475,10 +457,6 @@
+       <artifactId>yjp-controller-api-redist</artifactId>
+     </dependency>
+     <dependency>
+-      <groupId>com.google.code.findbugs</groupId>
+-      <artifactId>annotations</artifactId>
+-    </dependency>
+-    <dependency>
+       <groupId>com.google.guava</groupId>
+       <artifactId>guava</artifactId>
+     </dependency>
+diff -ur giraph-1.2.0/giraph-core/src/main/java/org/apache/giraph/ooc/OutOfCoreEngine.java giraph-1.2.0.new/giraph-core/src/main/java/org/apache/giraph/ooc/OutOfCoreEngine.java
+--- giraph-1.2.0/giraph-core/src/main/java/org/apache/giraph/ooc/OutOfCoreEngine.java	2016-07-16 06:27:24.000000000 +0900
++++ giraph-1.2.0.new/giraph-core/src/main/java/org/apache/giraph/ooc/OutOfCoreEngine.java	2020-02-15 09:09:23.000000000 +0900
+@@ -329,8 +329,6 @@
+    * Notify out-of-core engine that iteration cycle over all partitions is about
+    * to begin.
+    */
+-  @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+-      "UL_UNRELEASED_LOCK_EXCEPTION_PATH")
+   public void startIteration() {
+     if (!resetDone) {
+       superstepLock.writeLock().lock();
+diff -ur giraph-1.2.0/giraph-core/src/main/java/org/apache/giraph/ooc/data/DiskBackedDataStore.java giraph-1.2.0.new/giraph-core/src/main/java/org/apache/giraph/ooc/data/DiskBackedDataStore.java
+--- giraph-1.2.0/giraph-core/src/main/java/org/apache/giraph/ooc/data/DiskBackedDataStore.java	2016-07-16 06:27:24.000000000 +0900
++++ giraph-1.2.0.new/giraph-core/src/main/java/org/apache/giraph/ooc/data/DiskBackedDataStore.java	2020-02-15 09:09:58.000000000 +0900
+@@ -281,8 +281,6 @@
+    * @return number of bytes offloaded from memory to disk
+    * @throws IOException
+    */
+-  @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+-      "UL_UNRELEASED_LOCK_EXCEPTION_PATH")
+   protected long offloadPartitionDataProxy(
+       int partitionId, DataIndex index) throws IOException {
+     ReadWriteLock rwLock = getPartitionLock(partitionId);
+diff -ur giraph-1.2.0/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/LocalDiskDataAccessor.java giraph-1.2.0.new/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/LocalDiskDataAccessor.java
+--- giraph-1.2.0/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/LocalDiskDataAccessor.java	2016-07-16 06:27:24.000000000 +0900
++++ giraph-1.2.0.new/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/LocalDiskDataAccessor.java	2020-02-15 09:09:46.000000000 +0900
+@@ -163,8 +163,6 @@
+      *               reader
+      * @throws IOException
+      */
+-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+-        "OBL_UNSATISFIED_OBLIGATION")
+     LocalDiskDataInputWrapper(String fileName, byte[] buffer)
+         throws IOException {
+       file = new File(fileName);
+@@ -209,8 +207,6 @@
+      *               writer
+      * @throws IOException
+      */
+-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+-        "OBL_UNSATISFIED_OBLIGATION")
+     LocalDiskDataOutputWrapper(String fileName, boolean shouldAppend,
+                                byte[] buffer) throws IOException {
+       file = new File(fileName);
+diff -ur giraph-1.2.0/giraph-core/src/main/java/org/apache/giraph/utils/AdjustableSemaphore.java giraph-1.2.0.new/giraph-core/src/main/java/org/apache/giraph/utils/AdjustableSemaphore.java
+--- giraph-1.2.0/giraph-core/src/main/java/org/apache/giraph/utils/AdjustableSemaphore.java	2016-06-09 07:07:59.000000000 +0900
++++ giraph-1.2.0.new/giraph-core/src/main/java/org/apache/giraph/utils/AdjustableSemaphore.java	2020-02-15 09:10:10.000000000 +0900
+@@ -38,8 +38,6 @@
+     maxPermits = permits;
+   }
+ 
+-  @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+-      "UG_SYNC_SET_UNSYNC_GET")
+   public int getMaxPermits() {
+     return maxPermits;
+   }
+diff -ur giraph-1.2.0/giraph-debugger/pom.xml giraph-1.2.0.new/giraph-debugger/pom.xml
+--- giraph-1.2.0/giraph-debugger/pom.xml	2016-10-12 08:53:13.000000000 +0900
++++ giraph-1.2.0.new/giraph-debugger/pom.xml	2020-02-15 08:59:37.000000000 +0900
+@@ -136,24 +136,6 @@
            </execution>
          </executions>
        </plugin>
@@ -40,9 +215,9 @@ diff -ur giraph-1.1.0/giraph-core/pom.xml giraph-1.1.0.new/giraph-core/pom.xml
      </plugins>
    </build>
  
-diff -ur giraph-1.1.0/giraph-examples/pom.xml giraph-1.1.0.new/giraph-examples/pom.xml
---- giraph-1.1.0/giraph-examples/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-examples/pom.xml	2016-12-22 19:17:29.000000000 +0100
+diff -ur giraph-1.2.0/giraph-examples/pom.xml giraph-1.2.0.new/giraph-examples/pom.xml
+--- giraph-1.2.0/giraph-examples/pom.xml	2016-10-12 08:53:14.000000000 +0900
++++ giraph-1.2.0.new/giraph-examples/pom.xml	2020-02-15 08:57:58.000000000 +0900
 @@ -93,10 +93,6 @@
          <groupId>org.apache.rat</groupId>
          <artifactId>apache-rat-plugin</artifactId>
@@ -54,23 +229,23 @@ diff -ur giraph-1.1.0/giraph-examples/pom.xml giraph-1.1.0.new/giraph-examples/p
      </plugins>
    </build>
  
-diff -ur giraph-1.1.0/giraph-gora/pom.xml giraph-1.1.0.new/giraph-gora/pom.xml
---- giraph-1.1.0/giraph-gora/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-gora/pom.xml	2016-12-22 19:17:36.000000000 +0100
-@@ -67,10 +67,6 @@
-                     </systemProperties>
+diff -ur giraph-1.2.0/giraph-gora/pom.xml giraph-1.2.0.new/giraph-gora/pom.xml
+--- giraph-1.2.0/giraph-gora/pom.xml	2016-10-12 08:53:22.000000000 +0900
++++ giraph-1.2.0.new/giraph-gora/pom.xml	2020-02-15 08:59:55.000000000 +0900
+@@ -68,10 +68,6 @@
                  </configuration>
              </plugin>
--            <plugin>
+             <plugin>
 -                <groupId>org.codehaus.mojo</groupId>
 -                <artifactId>findbugs-maven-plugin</artifactId>
 -            </plugin>
-         </plugins>
-     </build>
- 
-diff -ur giraph-1.1.0/giraph-hbase/pom.xml giraph-1.1.0.new/giraph-hbase/pom.xml
---- giraph-1.1.0/giraph-hbase/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-hbase/pom.xml	2016-12-22 19:17:42.000000000 +0100
+-            <plugin>
+                 <groupId>org.apache.rat</groupId>
+                 <artifactId>apache-rat-plugin</artifactId>
+                 <configuration>
+diff -ur giraph-1.2.0/giraph-hbase/pom.xml giraph-1.2.0.new/giraph-hbase/pom.xml
+--- giraph-1.2.0/giraph-hbase/pom.xml	2016-10-12 08:53:14.000000000 +0900
++++ giraph-1.2.0.new/giraph-hbase/pom.xml	2020-02-15 09:11:01.000000000 +0900
 @@ -80,10 +80,6 @@
            </systemProperties>
          </configuration>
@@ -82,9 +257,9 @@ diff -ur giraph-1.1.0/giraph-hbase/pom.xml giraph-1.1.0.new/giraph-hbase/pom.xml
      </plugins>
    </build>
  
-diff -ur giraph-1.1.0/giraph-hcatalog/pom.xml giraph-1.1.0.new/giraph-hcatalog/pom.xml
---- giraph-1.1.0/giraph-hcatalog/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-hcatalog/pom.xml	2016-12-22 19:17:48.000000000 +0100
+diff -ur giraph-1.2.0/giraph-hcatalog/pom.xml giraph-1.2.0.new/giraph-hcatalog/pom.xml
+--- giraph-1.2.0/giraph-hcatalog/pom.xml	2016-10-12 08:53:14.000000000 +0900
++++ giraph-1.2.0.new/giraph-hcatalog/pom.xml	2020-02-15 09:10:45.000000000 +0900
 @@ -75,10 +75,6 @@
            </systemProperties>
          </configuration>
@@ -96,23 +271,9 @@ diff -ur giraph-1.1.0/giraph-hcatalog/pom.xml giraph-1.1.0.new/giraph-hcatalog/p
      </plugins>
    </build>
  
-diff -ur giraph-1.1.0/giraph-hive/pom.xml giraph-1.1.0.new/giraph-hive/pom.xml
---- giraph-1.1.0/giraph-hive/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-hive/pom.xml	2016-12-22 19:17:55.000000000 +0100
-@@ -85,10 +85,6 @@
-           </systemProperties>
-         </configuration>
-       </plugin>
--      <plugin>
--        <groupId>org.codehaus.mojo</groupId>
--        <artifactId>findbugs-maven-plugin</artifactId>
--      </plugin>
-     </plugins>
-   </build>
- 
-diff -ur giraph-1.1.0/giraph-rexster/giraph-kibble/pom.xml giraph-1.1.0.new/giraph-rexster/giraph-kibble/pom.xml
---- giraph-1.1.0/giraph-rexster/giraph-kibble/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-rexster/giraph-kibble/pom.xml	2016-12-22 19:32:12.000000000 +0100
+diff -ur giraph-1.2.0/giraph-rexster/giraph-kibble/pom.xml giraph-1.2.0.new/giraph-rexster/giraph-kibble/pom.xml
+--- giraph-1.2.0/giraph-rexster/giraph-kibble/pom.xml	2016-10-12 08:53:14.000000000 +0900
++++ giraph-1.2.0.new/giraph-rexster/giraph-kibble/pom.xml	2020-02-15 08:59:09.000000000 +0900
 @@ -79,10 +79,6 @@
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-javadoc-plugin</artifactId>
@@ -124,9 +285,9 @@ diff -ur giraph-1.1.0/giraph-rexster/giraph-kibble/pom.xml giraph-1.1.0.new/gira
      </plugins>
    </build>
  
-diff -ur giraph-1.1.0/giraph-rexster/giraph-rexster-io/pom.xml giraph-1.1.0.new/giraph-rexster/giraph-rexster-io/pom.xml
---- giraph-1.1.0/giraph-rexster/giraph-rexster-io/pom.xml	2014-11-01 06:25:12.000000000 +0100
-+++ giraph-1.1.0.new/giraph-rexster/giraph-rexster-io/pom.xml	2016-12-22 19:32:19.000000000 +0100
+diff -ur giraph-1.2.0/giraph-rexster/giraph-rexster-io/pom.xml giraph-1.2.0.new/giraph-rexster/giraph-rexster-io/pom.xml
+--- giraph-1.2.0/giraph-rexster/giraph-rexster-io/pom.xml	2016-10-12 08:53:14.000000000 +0900
++++ giraph-1.2.0.new/giraph-rexster/giraph-rexster-io/pom.xml	2020-02-15 08:58:52.000000000 +0900
 @@ -80,10 +80,6 @@
            </systemProperties>
          </configuration>
@@ -138,3 +299,76 @@ diff -ur giraph-1.1.0/giraph-rexster/giraph-rexster-io/pom.xml giraph-1.1.0.new/
      </plugins>
    </build>
  
+diff -ur giraph-1.2.0/pom.xml giraph-1.2.0.new/pom.xml
+--- giraph-1.2.0/pom.xml	2016-10-12 08:53:22.000000000 +0900
++++ giraph-1.2.0.new/pom.xml	2020-02-15 09:15:36.000000000 +0900
+@@ -331,7 +331,6 @@
+     <dep.facebook-swift.version>0.14.0</dep.facebook-swift.version>
+     <dep.fasterxml-jackson.version>2.1.2</dep.fasterxml-jackson.version>
+     <dep.fastutil.version>6.5.4</dep.fastutil.version>
+-    <dep.google.findbugs.version>2.0.2</dep.google.findbugs.version>
+     <dep.guava.version>18.0</dep.guava.version>
+     <dep.hbase.version>1.2.2</dep.hbase.version>
+     <dep.hcatalog.version>0.5.0-incubating</dep.hcatalog.version>
+@@ -634,12 +633,6 @@
+                   <exclude>com.google.collections:google-collections</exclude>
+                   <!-- but not the badly numbered ones... -->
+                   <exclude>com.google.guava:guava</exclude>
+-                  <!-- Clashes with com.google.code.findbugs:annotations and having both jars -->
+-                  <!-- as a dependency then clashes with the dependency checker (because it   -->
+-                  <!-- is not very good at handling annotations). Use the annotations jar     -->
+-                  <!-- instead which has all jsr305 annotations and the additional findbugs   -->
+-                  <!-- stuff. -->
+-                  <exclude>com.google.code.findbugs:jsr305</exclude>
+                   <!-- Use the official version at javax.servlet:javax.servlet-api -->
+                   <exclude>org.eclipse.jetty.orbit:javax.servlet</exclude>
+                   <!-- Renamed airlift modules -->
+@@ -798,24 +791,6 @@
+           </configuration>
+         </plugin>
+         <plugin>
+-          <groupId>org.codehaus.mojo</groupId>
+-          <artifactId>findbugs-maven-plugin</artifactId>
+-          <version>3.0.0</version>
+-          <configuration>
+-            <xmlOutput>true</xmlOutput>
+-            <findbugsXmlOutput>false</findbugsXmlOutput>
+-            <excludeFilterFile>${top.dir}/findbugs-exclude.xml</excludeFilterFile>
+-          </configuration>
+-          <executions>
+-            <execution>
+-              <phase>verify</phase>
+-              <goals>
+-                <goal>check</goal>
+-              </goals>
+-            </execution>
+-          </executions>
+-        </plugin>
+-        <plugin>
+           <groupId>org.sonatype.plugins</groupId>
+           <artifactId>munge-maven-plugin</artifactId>
+           <version>1.0</version>
+@@ -961,11 +936,6 @@
+                   <aggregate>true</aggregate>
+               </configuration>
+           </plugin>
+-          <plugin>
+-              <groupId>org.codehaus.mojo</groupId>
+-              <artifactId>findbugs-maven-plugin</artifactId>
+-              <version>3.0.0</version>
+-          </plugin>
+     </plugins>
+   </reporting>
+ 
+@@ -1547,11 +1517,6 @@
+         <version>${dep.cli-parser.version}</version>
+       </dependency>
+       <dependency>
+-        <groupId>com.google.code.findbugs</groupId>
+-        <artifactId>annotations</artifactId>
+-        <version>${dep.google.findbugs.version}</version>
+-      </dependency>
+-      <dependency>
+         <groupId>com.tinkerpop.blueprints</groupId>
+         <artifactId>blueprints-core</artifactId>
+         <version>${dep.tinkerpop.rexter.version}</version>
diff --git a/bigtop-packages/src/common/giraph/patch2-fix-pom.diff b/bigtop-packages/src/common/giraph/patch2-fix-pom.diff
new file mode 100644
index 0000000..26cac30
--- /dev/null
+++ b/bigtop-packages/src/common/giraph/patch2-fix-pom.diff
@@ -0,0 +1,21 @@
+diff -ur giraph-1.2.0/pom.xml giraph-1.2.0.new/pom.xml
+--- giraph-1.2.0/pom.xml	2020-02-15 13:32:08.188790392 +0900
++++ giraph-1.2.0.new/pom.xml	2020-02-15 13:41:49.161987124 +0900
+@@ -255,7 +255,7 @@
+   <repositories>
+     <repository>
+       <id>central</id>
+-      <url>http://repo1.maven.org/maven2</url>
++      <url>https://repo1.maven.org/maven2</url>
+       <releases>
+         <enabled>true</enabled>
+       </releases>
+@@ -787,6 +787,8 @@
+                 <exclude>giraph-debugger/src/main/resources/org/apache/giraph/debugger/mock/*.vm</exclude>
+                 <exclude>giraph-debugger/src/main/protobuf/*.proto</exclude> 
+                 <exclude>giraph-debugger/gui</exclude>
++		<exclude>debian/**</exclude>
++		<exclude>.pc/*</exclude>
+               </excludes>
+           </configuration>
+         </plugin>
diff --git a/bigtop.bom b/bigtop.bom
index 4485a5e..3431524 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -245,7 +245,7 @@ bigtop {
     'giraph' {
       name    = 'giraph'
       relNotes = 'Apache Giraph'
-      version { base = '1.1.0'; pkg = base; release = 1 }
+      version { base = '1.2.0'; pkg = base; release = 1 }
       tarball { destination = "$name-${version.base}.tar.gz"
                 source      = "$name-dist-${version.base}-src.tar.gz" }
       url     { download_path = "/$name/$name-${version.base}/"