[release] 0.6.0 - Merge develop to master

[release] 0.6.0

.gitattributes

@@ -0,0 +1,10 @@
+
+# Checkout all text files with LF line endings regardless of git config. Needed for:
+# - Checkstyle (all source code)
+# - gradoop-flink cam tests (resources/data/expected)
+# - gradoop-temporal cam tests (resources/data/expected)
+* text=auto eol=lf
+
+# Denote all binary files that aren't correctly auto detected. Example:
+#*.png binary
+#*.jpg binary

.github/workflows/maven.yml

@@ -8,14 +8,33 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1
+    - name: Set up Hadoop winutils (Windows)
+      if: matrix.os == 'windows-latest'
+      run: |
+        mkdir C:\winutils
+        cd C:\winutils
+        git init
+        git remote add origin https://github.com/cdarlint/winutils
+        git config core.sparseCheckout true
+        echo "hadoop-3.2.1" > .git\info\sparse-checkout
+        git pull origin master
+        echo "HADOOP_HOME=C:\winutils\hadoop-3.2.1" >> $env:GITHUB_ENV
+        echo "PATH=$env:PATH;$env:HADOOP_HOME\bin" >> $env:GITHUB_ENV
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
     - name: Build with Maven
       run: |
-        mvn clean install -DskipTests
-        mvn clean verify
+        mvn clean install -DskipTests --no-transfer-progress -DtrimStackTrace=false
+    - name: Test with Maven
+      if: matrix.os != 'windows-latest'
+      run: |
+        mvn verify --no-transfer-progress -DtrimStackTrace=false
+    - name: Test with Maven (Windows)
+      if: matrix.os == 'windows-latest'
+      run: |
+        mvn verify -pl !:gradoop-hbase,!:gradoop-accumulo --no-transfer-progress -DtrimStackTrace=false

NOTICE

@@ -1,12 +1,11 @@
 Gradoop
-Copyright 2014-2019 Leipzig University (Database Research Group)
+Copyright 2014-2021 Leipzig University (Database Research Group)
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- com.github.s1ck:gdl:0.3
 - commons-cli:commons-cli:1.4
 - log4j:log4j:1.2.17
 - me.lemire.integercompression:JavaFastPFOR:0.1.10

NOTICE-binary

@@ -4,14 +4,13 @@
 // ------------------------------------------------------------------
 
 gradoop-accumulo
-Copyright 2014-2019 Leipzig University (Database Research Group)
+Copyright 2014-2021 Leipzig University (Database Research Group)
 
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- com.github.s1ck:gdl:0.3
 - com.google.guava:guava:11.0.2
 - commons-cli:commons-cli:1.4
-- commons-lang:commons-lang:2.6
+- org.apache.commons:commons-lang3:3.11
 - log4j:log4j:1.2.17
 - me.lemire.integercompression:JavaFastPFOR:0.1.10
 - org.codehaus.jettison:jettison:1.3.7

README.md

@@ -1,6 +1,6 @@
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)](https://www.apache.org/licenses/LICENSE-2.0)
-[![Maven Central](https://img.shields.io/badge/Maven_Central-0.5.2-blue.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cgradoop)
-[![Build Status](https://travis-ci.org/dbs-leipzig/gradoop.svg?branch=master)](https://travis-ci.org/dbs-leipzig/gradoop)
+[![Maven Central](https://img.shields.io/badge/Maven_Central-0.6.0-blue.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cgradoop)
+[![Build Status](https://github.com/dbs-leipzig/gradoop/workflows/Java%20CI/badge.svg)](https://github.com/dbs-leipzig/gradoop/actions?workflow=Java+CI)
 [![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/dbs-leipzig/gradoop.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/dbs-leipzig/gradoop/context:java)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/dbs-leipzig/gradoop.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/dbs-leipzig/gradoop/alerts)
 
@@ -24,7 +24,8 @@ help getting started using Gradoop.
 
 ##### Further Information (articles and talks)
 
-* [Graph Sampling with Distributed In-Memory Dataflow Systems, arXiv, October 2019](https://arxiv.org/pdf/1910.04493.pdf)
+* [Exploration and Analysis of Temporal Property Graphs, EDBT Demo, March 2021](https://dbs.uni-leipzig.de/file/EDBT_DEMO_Rost_2021_published.pdf)
+* [Graph Sampling with Distributed In-Memory Dataflow Systems, BTW, March 2021](https://dbs.uni-leipzig.de/file/A3-21.pdf)
 * [Evolution Analysis of Large Graphs with Gradoop, ECML PKDD LEG Workshop, September 2019](https://dbs.uni-leipzig.de/file/LEGECML-PKDD_2019_paper_9.pdf)
 * [Gradoop @Gridka Keynote Distributed Graph Analytics, August 2019](https://indico.scc.kit.edu/event/460/contributions/5772/attachments/2873/4171/gradoop_gridka19.pdf)
 * [Temporal Graph Analysis using Gradoop, BTW 2019-Workshopband, March 2019](https://dl.gi.de/bitstream/handle/20.500.12116/21797/C2-1.pdf)
@@ -72,7 +73,7 @@ Stable:
 <dependency>
     <groupId>org.gradoop</groupId>
     <artifactId>gradoop-flink</artifactId>
-    <version>0.5.2</version>
+    <version>0.6.0</version>
 </dependency>
 ```
 
@@ -92,22 +93,22 @@ Latest weekly build (additional repository is required):
 <dependency>
     <groupId>org.gradoop</groupId>
     <artifactId>gradoop-flink</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
 </dependency>
 
 ```
-In any case you also need Apache Flink (version 1.7.2):
+In any case you also need Apache Flink (version 1.9.3):
 ```xml
 <dependencies>
     <dependency>
         <groupId>org.apache.flink</groupId>
         <artifactId>flink-java</artifactId>
-        <version>1.7.2</version>
+        <version>1.9.3</version>
     </dependency>
     <dependency>
         <groupId>org.apache.flink</groupId>
         <artifactId>flink-clients_2.11</artifactId>
-        <version>1.7.2</version>
+        <version>1.9.3</version>
     </dependency>
 </dependencies>
 ```
@@ -124,7 +125,15 @@ In any case you also need Apache Flink (version 1.7.2):
     > cd gradoop
     
     > mvn clean install
-    
+
+* You might want to skip tests for faster builds. Also, some tests fail on Windows due to missing test dependencies
+
+    > mvn clean install -DskipTests
+
+### Windows
+
+* Some operators require the Hadoop winutils
+
 ## Gradoop modules
 
 ### gradoop-common
@@ -174,6 +183,10 @@ Used to maintain the code style for the whole project.
 
 ## Related Repositories
 
+### [Gradoop Tutorial](https://github.com/dbs-leipzig/gradoop-tutorial)
+
+Gradoop Tutorial which has been shown in [BOSS20'](https://boss-workshop.github.io/boss-2020/) Workshop of VLDB 2020 international conference.
+
 ### [Gradoop Benchmarks](https://github.com/dbs-leipzig/gradoop-benchmarks)
 
 This repository contains sets of Gradoop operator benchmarks designed to run on a cluster to measure
@@ -183,6 +196,15 @@ scalability and speedup of the operators.
 
 Demo application to show the functionalities of the grouping and query operator in an interactive web UI.
 
+
+### [Temporal Graph Explorer](https://github.com/dbs-leipzig/temporal_graph_explorer)
+
+Gradoop Temporal Graph Explorer Demo which showcases some operators of the Temporal Property Graph Model.
+
+### [Gradoop GDL](https://github.com/dbs-leipzig/gdl)
+
+This repository contains the definition of our Temporal Graph Definition Language (Temporal-GDL).
+
 ### Version History
 
 See the [Changelog](https://github.com/dbs-leipzig/gradoop/wiki/Changelog) at the Wiki pages. 

gradoop-checkstyle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.gradoop</groupId>
         <artifactId>gradoop-parent</artifactId>
-        <version>0.5.2</version>
+        <version>0.6.0</version>
     </parent>
 
     <artifactId>gradoop-checkstyle</artifactId>

gradoop-checkstyle/src/main/resources/gradoop/LICENSE.txt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-checkstyle/src/main/resources/gradoop/checkstyle-suppressions.xml

@@ -10,10 +10,10 @@
              lines="0-9999"/>
   <suppress checks="IllegalCatch"
             files="BaseGellyAlgorithm.java"
-            lines="36-42"/>
+            lines="50-55"/>
   <suppress checks="IllegalCatch"
             files="GradoopGellyAlgorithm.java"
-            lines="70-77"/>
+            lines="80-85"/>
   <suppress checks="IllegalCatch"
             files="PrintTableSink"
             lines="90-100"/>

gradoop-common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.gradoop</groupId>
         <artifactId>gradoop-parent</artifactId>
-        <version>0.5.2</version>
+        <version>0.6.0</version>
     </parent>
 
     <artifactId>gradoop-common</artifactId>
@@ -102,8 +102,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
 
         <!-- Flink -->
@@ -114,8 +114,8 @@
 
         <!-- Others -->
         <dependency>
-            <groupId>com.github.s1ck</groupId>
-            <artifactId>gdl</artifactId>
+            <groupId>org.gradoop</groupId>
+            <artifactId>gradoop-gdl</artifactId>
         </dependency>
 
         <dependency>

gradoop-common/src/main/java/org/gradoop/common/config/GradoopConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/config/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/exceptions/UnsupportedTypeException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/exceptions/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/Attributed.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/Edge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/EdgeFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/Element.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/ElementFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/ElementFactoryProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/GraphElement.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/GraphHead.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/GraphHeadFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/Identifiable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/Labeled.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/Vertex.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/VertexFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/strategies/PropertyValueStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/api/strategies/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/IdentifiableComparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradoop-common/src/main/java/org/gradoop/common/model/impl/id/GradoopId.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 - 2020 Leipzig University (Database Research Group)
+ * Copyright © 2014 - 2021 Leipzig University (Database Research Group)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.