This is an automated email from the ASF dual-hosted git repository.
bertty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git
The following commit(s) were added to refs/heads/main by this push:
new f75d415 [RELEASE][PREPARATION] correction dependecies in java11 with
a profile automatically trigger
f75d415 is described below
commit f75d41584da436772c5892a1f7751d73f98e58e6
Author: Bertty Contreras-Rojas <[email protected]>
AuthorDate: Wed Oct 13 17:34:28 2021 +0200
[RELEASE][PREPARATION] correction dependecies in java11 with a profile
automatically trigger
Signed-off-by: bertty <[email protected]>
---
pom.xml | 2 +-
wayang-api/wayang-api-scala-java/pom.xml | 19 +++++++++++---
wayang-benchmark/pom.xml | 19 ++++++++++----
wayang-platforms/wayang-flink/pom.xml | 21 +++++++++++++---
wayang-platforms/wayang-spark/pom.xml | 19 +++++++++++---
wayang-plugins/wayang-iejoin/pom.xml | 18 +++++++++++---
wayang-profiler/pom.xml | 37 +++++++++-------------------
wayang-profiler/wayang-profiler_2.11/pom.xml | 20 +++++++++++++++
wayang-tests-integration/pom.xml | 20 ++++++++++++---
9 files changed, 124 insertions(+), 51 deletions(-)
diff --git a/pom.xml b/pom.xml
index 11a1dd7..05ad640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -382,7 +382,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <source>8</source>
+ <source>11</source>
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
</plugin>
diff --git a/wayang-api/wayang-api-scala-java/pom.xml
b/wayang-api/wayang-api-scala-java/pom.xml
index 1c457d0..cc6e2b4 100644
--- a/wayang-api/wayang-api-scala-java/pom.xml
+++ b/wayang-api/wayang-api-scala-java/pom.xml
@@ -20,10 +20,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <modules>
- <module>wayang-api-scala-java_2.11</module>
- <module>wayang-api-scala-java_2.12</module>
- </modules>
<parent>
<artifactId>wayang-api</artifactId>
@@ -128,4 +124,19 @@
</build>
+ <modules>
+ <module>wayang-api-scala-java_2.12</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <modules>
+ <module>wayang-api-scala-java_2.11</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/wayang-benchmark/pom.xml b/wayang-benchmark/pom.xml
index 23b4c9c..7ba00ca 100644
--- a/wayang-benchmark/pom.xml
+++ b/wayang-benchmark/pom.xml
@@ -27,10 +27,6 @@
<artifactId>wayang-benchmark</artifactId>
<packaging>pom</packaging>
- <modules>
- <module>wayang-benchmark_2.11</module>
- <module>wayang-benchmark_2.12</module>
- </modules>
<dependencies>
<dependency>
@@ -75,6 +71,19 @@
</dependency>
</dependencies>
+ <modules>
+ <module>wayang-benchmark_2.12</module>
+ </modules>
-
+ <profiles>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <modules>
+ <module>wayang-benchmark_2.11</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/wayang-platforms/wayang-flink/pom.xml
b/wayang-platforms/wayang-flink/pom.xml
index 3acd869..789896b 100644
--- a/wayang-platforms/wayang-flink/pom.xml
+++ b/wayang-platforms/wayang-flink/pom.xml
@@ -20,10 +20,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <modules>
- <module>wayang-flink_2.11</module>
- <module>wayang-flink_2.12</module>
- </modules>
<parent>
<artifactId>wayang-platforms</artifactId>
@@ -120,4 +116,21 @@
<version>3.4.1</version>
</dependency>
</dependencies>
+
+ <modules>
+ <module>wayang-flink_2.12</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <modules>
+ <module>wayang-flink_2.11</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
diff --git a/wayang-platforms/wayang-spark/pom.xml
b/wayang-platforms/wayang-spark/pom.xml
index b4fd7fb..f26a918 100644
--- a/wayang-platforms/wayang-spark/pom.xml
+++ b/wayang-platforms/wayang-spark/pom.xml
@@ -20,10 +20,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <modules>
- <module>wayang-spark_2.11</module>
- <module>wayang-spark_2.12</module>
- </modules>
<parent>
<artifactId>wayang-platforms</artifactId>
@@ -101,4 +97,19 @@
</dependency>
</dependencies>
+ <modules>
+ <module>wayang-spark_2.12</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <modules>
+ <module>wayang-spark_2.11</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/wayang-plugins/wayang-iejoin/pom.xml
b/wayang-plugins/wayang-iejoin/pom.xml
index f3cefc3..44b601c 100644
--- a/wayang-plugins/wayang-iejoin/pom.xml
+++ b/wayang-plugins/wayang-iejoin/pom.xml
@@ -13,10 +13,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <modules>
- <module>wayang-iejoin_2.11</module>
- <module>wayang-iejoin_2.12</module>
- </modules>
<parent>
<artifactId>wayang-plugins</artifactId>
@@ -60,5 +56,19 @@
</dependencies>
+ <modules>
+ <module>wayang-iejoin_2.12</module>
+ </modules>
+ <profiles>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <modules>
+ <module>wayang-iejoin_2.11</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/wayang-profiler/pom.xml b/wayang-profiler/pom.xml
index 1f9b0fd..92bf05a 100644
--- a/wayang-profiler/pom.xml
+++ b/wayang-profiler/pom.xml
@@ -20,10 +20,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <modules>
- <module>wayang-profiler_2.11</module>
- <module>wayang-profiler_2.12</module>
- </modules>
<parent>
<artifactId>wayang</artifactId>
@@ -90,29 +86,20 @@
<version>0.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
+
+ <modules>
+ <module>wayang-profiler_2.12</module>
+ </modules>
+
<profiles>
<profile>
- <id>scala-11</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.wayang</groupId>
- <artifactId>wayang-graphchi_2.11</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.graphchi</groupId>
- <artifactId>graphchi-java_2.11</artifactId>
- <version>0.2.2</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
+ <id>java8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <modules>
+ <module>wayang-profiler_2.11</module>
+ </modules>
</profile>
</profiles>
</project>
diff --git a/wayang-profiler/wayang-profiler_2.11/pom.xml
b/wayang-profiler/wayang-profiler_2.11/pom.xml
index 368a51b..f54292f 100644
--- a/wayang-profiler/wayang-profiler_2.11/pom.xml
+++ b/wayang-profiler/wayang-profiler_2.11/pom.xml
@@ -29,4 +29,24 @@
<artifactId>wayang-profiler_2.11</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-graphchi_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.graphchi</groupId>
+ <artifactId>graphchi-java_2.11</artifactId>
+ <version>0.2.2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-tests-integration/pom.xml b/wayang-tests-integration/pom.xml
index d19149d..1d79153 100644
--- a/wayang-tests-integration/pom.xml
+++ b/wayang-tests-integration/pom.xml
@@ -20,10 +20,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <modules>
- <module>wayang-tests-integration_2.11</module>
- <module>wayang-tests-integration_2.12</module>
- </modules>
<parent>
<artifactId>wayang</artifactId>
@@ -272,4 +268,20 @@
</plugin>
</plugins>
</build>
+
+ <modules>
+ <module>wayang-tests-integration_2.12</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <modules>
+ <module>wayang-tests-integration_2.11</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
