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
commit 0f7ad3e3ffdeeb0067146e1a50b0c9fa881700a1 Author: Bertty Contreras-Rojas <[email protected]> AuthorDate: Mon Oct 11 20:49:51 2021 +0200 [RELEASE][PREPARATION][FIX] Creation of the artifact for differnt version of scala at release moment Signed-off-by: bertty <[email protected]> --- bin/create_scala_structure.sh | 33 ++++++ pom.xml | 122 +++++---------------- wayang-api/pom.xml | 4 +- wayang-api/wayang-api-python/pom.xml | 4 +- wayang-api/wayang-api-scala-java/pom.xml | 27 +++-- wayang-api/wayang-api-scala-java/scala_12 | 0 .../wayang-api-scala-java_2.11}/pom.xml | 28 ++--- .../wayang-api-scala-java_2.11/scala_11 | 0 .../wayang-api-scala-java_2.12}/pom.xml | 27 ++--- .../wayang-api-scala-java_2.12/scala_12 | 0 .../wayang-api-scala-java_2.12/src | 1 + wayang-benchmark/pom.xml | 28 +++-- wayang-benchmark/scala_12 | 0 .../wayang-benchmark_2.11}/pom.xml | 28 ++--- wayang-benchmark/wayang-benchmark_2.11/scala_11 | 0 wayang-benchmark/wayang-benchmark_2.11/src | 1 + .../wayang-benchmark_2.12}/pom.xml | 27 ++--- wayang-benchmark/wayang-benchmark_2.12/scala_12 | 0 wayang-benchmark/wayang-benchmark_2.12/src | 1 + wayang-commons/pom.xml | 4 +- wayang-commons/wayang-basic/pom.xml | 8 +- wayang-commons/wayang-core/pom.xml | 6 +- wayang-commons/wayang-utils-profile-db/pom.xml | 2 +- wayang-distro/pom.xml | 10 +- wayang-platforms/pom.xml | 16 +-- wayang-platforms/wayang-flink/pom.xml | 17 ++- wayang-platforms/wayang-flink/scala_12 | 0 .../wayang-flink/wayang-flink_2.11}/pom.xml | 27 ++--- .../wayang-flink/wayang-flink_2.11/scala_11 | 0 .../wayang-flink/wayang-flink_2.11/src | 1 + .../wayang-flink/wayang-flink_2.12}/pom.xml | 27 ++--- .../wayang-flink/wayang-flink_2.12/scala_12 | 0 .../wayang-flink/wayang-flink_2.12/src | 1 + wayang-platforms/wayang-giraph/pom.xml | 10 +- wayang-platforms/wayang-graphchi/pom.xml | 4 +- wayang-platforms/wayang-graphchi/scala_11 | 0 wayang-platforms/wayang-java/pom.xml | 12 +- wayang-platforms/wayang-jdbc-template/pom.xml | 12 +- wayang-platforms/wayang-postgres/pom.xml | 8 +- wayang-platforms/wayang-spark/pom.xml | 17 ++- wayang-platforms/wayang-spark/scala_12 | 0 .../wayang-spark/wayang-spark_2.11}/pom.xml | 27 ++--- .../wayang-spark/wayang-spark_2.11/scala_11 | 0 .../wayang-spark/wayang-spark_2.11/src | 1 + .../wayang-spark/wayang-spark_2.12}/pom.xml | 27 ++--- .../wayang-spark/wayang-spark_2.12/scala_12 | 0 .../wayang-spark/wayang-spark_2.12/src | 1 + wayang-platforms/wayang-sqlite3/pom.xml | 10 +- wayang-plugins/pom.xml | 4 +- wayang-plugins/wayang-iejoin/pom.xml | 19 ++-- wayang-plugins/wayang-iejoin/scala_12 | 0 .../wayang-iejoin/wayang-iejoin_2.11}/pom.xml | 27 ++--- .../wayang-iejoin/wayang-iejoin_2.11/scala_11 | 0 .../wayang-iejoin/wayang-iejoin_2.11/src | 1 + .../wayang-iejoin/wayang-iejoin_2.12}/pom.xml | 27 ++--- .../wayang-iejoin/wayang-iejoin_2.12/scala_12 | 0 .../wayang-iejoin/wayang-iejoin_2.12/src | 1 + wayang-profiler/pom.xml | 25 +++-- wayang-profiler/scala_12 | 0 .../wayang-profiler_2.11}/pom.xml | 28 ++--- wayang-profiler/wayang-profiler_2.11/scala_11 | 0 wayang-profiler/wayang-profiler_2.11/src | 1 + .../wayang-profiler_2.12}/pom.xml | 27 ++--- wayang-profiler/wayang-profiler_2.12/scala_12 | 0 wayang-profiler/wayang-profiler_2.12/src | 1 + wayang-resources/pom.xml | 2 +- wayang-tests-integration/pom.xml | 58 +++++++--- wayang-tests-integration/scala_12 | 0 .../wayang-tests-integration_2.11}/pom.xml | 31 +++--- .../wayang-tests-integration_2.11/scala_11 | 0 .../wayang-tests-integration_2.12}/pom.xml | 31 +++--- .../wayang-tests-integration_2.12/scala_12 | 0 72 files changed, 394 insertions(+), 468 deletions(-) diff --git a/bin/create_scala_structure.sh b/bin/create_scala_structure.sh new file mode 100644 index 0000000..505f86f --- /dev/null +++ b/bin/create_scala_structure.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +################################################################################ +## +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## +################################################################################ + +REPOSITORY_PATH="wayang-platform/wayang-spark" +REPOSITORY_NAME=$(basename REPOSITORY_PATH) +SCALA_VERSION=(2.11 2.12) + +#cd ${REPOSITORY_PATH} +#mv ./src ./code + +for sc_version in ${SCALA_VERSION} +do + echo "${sc_version}" + mkdir -p "${REPOSITORY_NAME}" +done diff --git a/pom.xml b/pom.xml index f67c0b9..c226fa5 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.wayang</groupId> <artifactId>wayang</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Wayang</name> @@ -181,7 +181,7 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-resources</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <type>zip</type> <optional>true</optional> </dependency> @@ -435,6 +435,15 @@ <exists>src/main/scala</exists> </file> </activation> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>${scala.version}</version> + </dependency> + </dependencies> + </dependencyManagement> <build> <pluginManagement> <plugins> @@ -473,67 +482,6 @@ </execution--> </executions> </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <finalName>${project.artifactId}_${scala.mayor.version}-${project.version}</finalName> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-pom</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/${scala.mayor.version}</outputDirectory> - <resources> - <resource> - <directory>${basedir}</directory> - <includes> - <include>pom.xml</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <executions> - <execution> - <id>default-install</id> - <configuration> - <skip>true</skip> - </configuration> - </execution> - <execution> - <id>install-scala-version</id> - <phase>install</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}_${scala.mayor.version}</artifactId> - <version>${project.version}</version> - <packaging>${project.packaging}</packaging> - <file>${project.build.directory}/${project.artifactId}_${scala.mayor.version}-${project.version}.jar</file> - <pomFile>${project.build.directory}/${scala.mayor.version}/replacer/pom.xml</pomFile> - </configuration> - </execution> - </executions> - </plugin> </plugins> </pluginManagement> <plugins> @@ -544,40 +492,19 @@ <!-- <plugin>--> <!-- <artifactId>maven-jar-plugin</artifactId>--> <!-- </plugin>--> - <plugin> - <groupId>com.google.code.maven-replacer-plugin</groupId> - <artifactId>replacer</artifactId> - <version>1.5.3</version> - <executions> - <execution> - <id>replace-artifactid</id> - <phase>prepare-package</phase> - <goals> - <goal>replace</goal> - </goals> - <configuration> - <includes> - <include>${basedir}/target/${scala.mayor.version}/pom.xml</include> - </includes> - <replacements> - <replacement> - <token><artifactId>${project.artifactId}</artifactId></token> - <value><artifactId>${project.artifactId}_${scala.mayor.version}</artifactId></value> - </replacement> - </replacements> - - <!-- Replace to --> - <outputFile>${basedir}/target/${scala.mayor.version}/replacer/pom.xml</outputFile> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </profile> <profile> <id>scala-11</id> + <activation> + <file> + <exists> + scala_11 + </exists> + </file> + </activation> <properties> <scala.version>2.11.12</scala.version> <scala.mayor.version>2.11</scala.mayor.version> @@ -587,6 +514,13 @@ <profile> <id>scala-12</id> + <activation> + <file> + <exists> + scala_12 + </exists> + </file> + </activation> <properties> <scala.version>2.12.12</scala.version> <scala.mayor.version>2.12</scala.mayor.version> @@ -784,11 +718,6 @@ <scope>import</scope> <type>pom</type> </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </dependency> </dependencies> </dependencyManagement> @@ -1076,6 +1005,7 @@ <exclude>**/Gemfile.lock</exclude> <exclude>**/.jekyll-cache/**</exclude> <exclude>**/README.md</exclude> + <exclude>**/scala_1*</exclude> </excludes> </configuration> </plugin> diff --git a/wayang-api/pom.xml b/wayang-api/pom.xml index e31751b..4755a8c 100644 --- a/wayang-api/pom.xml +++ b/wayang-api/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-api</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wayang API</name> diff --git a/wayang-api/wayang-api-python/pom.xml b/wayang-api/wayang-api-python/pom.xml index 5a3ad44..9becbb2 100644 --- a/wayang-api/wayang-api-python/pom.xml +++ b/wayang-api/wayang-api-python/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang-api</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-api-python</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang API Python</name> <description>Wayang implementation of an API of Python to be enable to work with code writed in python</description> diff --git a/wayang-api/wayang-api-scala-java/pom.xml b/wayang-api/wayang-api-scala-java/pom.xml index 1cbd048..2621453 100644 --- a/wayang-api/wayang-api-scala-java/pom.xml +++ b/wayang-api/wayang-api-scala-java/pom.xml @@ -19,15 +19,20 @@ --> <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> + <parent> <artifactId>wayang-api</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-api-scala-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang API Scala-Java</name> <description>Wayang implementation of an API of Scala-Java to be enable to work in functional style</description> @@ -41,7 +46,7 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-commons</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -52,17 +57,17 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-utils-profile-db</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -72,13 +77,13 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-spark</artifactId> - <version>0.6.1-SNAPSHOT</version> + <artifactId>wayang-spark_${scala.mayor.version}</artifactId> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> @@ -90,7 +95,7 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-sqlite3</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> diff --git a/wayang-api/wayang-api-scala-java/scala_12 b/wayang-api/wayang-api-scala-java/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/pom.xml index c370637..8130302 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/pom.xml @@ -17,24 +17,16 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> +<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";> + <parent> + <artifactId>wayang-api-scala-java</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wayang-api-scala-java_2.11</artifactId> </project> diff --git a/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/scala_11 b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/scala_11 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/pom.xml index c370637..2336ea2 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-api-scala-java</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-api-scala-java_2.12</artifactId> </project> diff --git a/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/scala_12 b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/src b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-benchmark/pom.xml b/wayang-benchmark/pom.xml index 0da13ba..23b4c9c 100644 --- a/wayang-benchmark/pom.xml +++ b/wayang-benchmark/pom.xml @@ -21,53 +21,57 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wayang-benchmark</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> + <modules> + <module>wayang-benchmark_2.11</module> + <module>wayang-benchmark_2.12</module> + </modules> <dependencies> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-utils-profile-db</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-api-scala-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <artifactId>wayang-api-scala-java_${scala.mayor.version}</artifactId> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-spark</artifactId> - <version>0.6.1-SNAPSHOT</version> + <artifactId>wayang-spark_${scala.mayor.version}</artifactId> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-postgres</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-sqlite3</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/wayang-benchmark/scala_12 b/wayang-benchmark/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-benchmark/wayang-benchmark_2.11/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-benchmark/wayang-benchmark_2.11/pom.xml index c370637..b7080b0 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-benchmark/wayang-benchmark_2.11/pom.xml @@ -17,24 +17,16 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> +<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";> + <parent> + <artifactId>wayang-benchmark</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wayang-benchmark_2.11</artifactId> </project> diff --git a/wayang-benchmark/wayang-benchmark_2.11/scala_11 b/wayang-benchmark/wayang-benchmark_2.11/scala_11 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-benchmark/wayang-benchmark_2.11/src b/wayang-benchmark/wayang-benchmark_2.11/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-benchmark/wayang-benchmark_2.11/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-benchmark/wayang-benchmark_2.12/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-benchmark/wayang-benchmark_2.12/pom.xml index c370637..400088f 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-benchmark/wayang-benchmark_2.12/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-benchmark</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-benchmark_2.12</artifactId> </project> diff --git a/wayang-benchmark/wayang-benchmark_2.12/scala_12 b/wayang-benchmark/wayang-benchmark_2.12/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-benchmark/wayang-benchmark_2.12/src b/wayang-benchmark/wayang-benchmark_2.12/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-benchmark/wayang-benchmark_2.12/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-commons/pom.xml b/wayang-commons/pom.xml index bb5cf3d..9b2a3ed 100644 --- a/wayang-commons/pom.xml +++ b/wayang-commons/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>org.apache.wayang</groupId> <artifactId>wayang</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-commons</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wayang Commons</name> diff --git a/wayang-commons/wayang-basic/pom.xml b/wayang-commons/wayang-basic/pom.xml index 238cd31..10b1fa5 100644 --- a/wayang-commons/wayang-basic/pom.xml +++ b/wayang-commons/wayang-basic/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang-commons</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Basic</name> <description> @@ -38,12 +38,12 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-utils-profile-db</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/wayang-commons/wayang-core/pom.xml b/wayang-commons/wayang-core/pom.xml index 780c04a..536f97e 100644 --- a/wayang-commons/wayang-core/pom.xml +++ b/wayang-commons/wayang-core/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang-commons</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Core</name> <description> @@ -87,7 +87,7 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-utils-profile-db</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-commons/wayang-utils-profile-db/pom.xml index c370637..2258ed8 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-commons/wayang-utils-profile-db/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>wayang-commons</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/wayang-distro/pom.xml b/wayang-distro/pom.xml index 6b294f5..e9e2a7e 100644 --- a/wayang-distro/pom.xml +++ b/wayang-distro/pom.xml @@ -71,12 +71,12 @@ </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-spark</artifactId> + <artifactId>wayang-spark_${scala.mayor.version}</artifactId> <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-profiler</artifactId> + <artifactId>wayang-profiler_${scala.mayor.version}</artifactId> <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> @@ -96,12 +96,12 @@ </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-api-scala-java</artifactId> + <artifactId>wayang-api-scala-java_${scala.mayor.version}</artifactId> <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-flink</artifactId> + <artifactId>wayang-flink_${scala.mayor.version}</artifactId> <version>0.6.0-SNAPSHOT</version> </dependency> </dependencies> @@ -111,7 +111,7 @@ <dependencies> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-graphchi</artifactId> + <artifactId>wayang-graphchi_2.11</artifactId> <version>0.6.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/wayang-platforms/pom.xml b/wayang-platforms/pom.xml index bcc5b9a..d6b5580 100644 --- a/wayang-platforms/pom.xml +++ b/wayang-platforms/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-platforms</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wayang Platform</name> @@ -43,6 +43,7 @@ <module>wayang-sqlite3</module> <module>wayang-giraph</module> <module>wayang-flink</module> + <module>wayang-graphchi</module> </modules> <dependencyManagement> @@ -50,20 +51,11 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-commons</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> </dependencies> </dependencyManagement> - <profiles> - <profile> - <id>scala-11</id> - <modules> - <module>wayang-graphchi</module> - </modules> - </profile> - </profiles> - </project> diff --git a/wayang-platforms/wayang-flink/pom.xml b/wayang-platforms/wayang-flink/pom.xml index a29d9b1..3acd869 100644 --- a/wayang-platforms/wayang-flink/pom.xml +++ b/wayang-platforms/wayang-flink/pom.xml @@ -19,15 +19,20 @@ --> <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> + <parent> <artifactId>wayang-platforms</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-flink</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Platform Apache Flink</name> <description> @@ -45,17 +50,17 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/wayang-platforms/wayang-flink/scala_12 b/wayang-platforms/wayang-flink/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-platforms/wayang-flink/wayang-flink_2.11/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-platforms/wayang-flink/wayang-flink_2.11/pom.xml index c370637..528cbca 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-platforms/wayang-flink/wayang-flink_2.11/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-flink</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-flink_2.11</artifactId> </project> diff --git a/wayang-platforms/wayang-flink/wayang-flink_2.11/scala_11 b/wayang-platforms/wayang-flink/wayang-flink_2.11/scala_11 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-platforms/wayang-flink/wayang-flink_2.11/src b/wayang-platforms/wayang-flink/wayang-flink_2.11/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-platforms/wayang-flink/wayang-flink_2.11/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-platforms/wayang-flink/wayang-flink_2.12/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-platforms/wayang-flink/wayang-flink_2.12/pom.xml index c370637..6d7d6da 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-platforms/wayang-flink/wayang-flink_2.12/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-flink</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-flink_2.12</artifactId> </project> diff --git a/wayang-platforms/wayang-flink/wayang-flink_2.12/scala_12 b/wayang-platforms/wayang-flink/wayang-flink_2.12/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-platforms/wayang-flink/wayang-flink_2.12/src b/wayang-platforms/wayang-flink/wayang-flink_2.12/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-platforms/wayang-flink/wayang-flink_2.12/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-platforms/wayang-giraph/pom.xml b/wayang-platforms/wayang-giraph/pom.xml index 5408dcf..7e1450b 100644 --- a/wayang-platforms/wayang-giraph/pom.xml +++ b/wayang-platforms/wayang-giraph/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang-platforms</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-giraph</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Platform Giraph</name> <description> @@ -43,17 +43,17 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/wayang-platforms/wayang-graphchi/pom.xml b/wayang-platforms/wayang-graphchi/pom.xml index 0554c9a..e6c4ab2 100644 --- a/wayang-platforms/wayang-graphchi/pom.xml +++ b/wayang-platforms/wayang-graphchi/pom.xml @@ -26,7 +26,7 @@ <version>0.6.0-SNAPSHOT</version> </parent> - <artifactId>wayang-graphchi</artifactId> + <artifactId>wayang-graphchi_2.11</artifactId> <version>0.6.0-SNAPSHOT</version> <name>Wayang Graphchi</name> @@ -42,7 +42,7 @@ <dependencies> <dependency> <groupId>org.graphchi</groupId> - <artifactId>graphchi-java_${scala.mayor.version}</artifactId> + <artifactId>graphchi-java_2.11</artifactId> <version>${graphchi.version}</version> </dependency> diff --git a/wayang-platforms/wayang-graphchi/scala_11 b/wayang-platforms/wayang-graphchi/scala_11 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-platforms/wayang-java/pom.xml b/wayang-platforms/wayang-java/pom.xml index dd8e92e..2a01c4c 100644 --- a/wayang-platforms/wayang-java/pom.xml +++ b/wayang-platforms/wayang-java/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang-platforms</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Platform Java</name> <description> @@ -42,13 +42,13 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -58,10 +58,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </dependency> </dependencies> </project> diff --git a/wayang-platforms/wayang-jdbc-template/pom.xml b/wayang-platforms/wayang-jdbc-template/pom.xml index f1eabc8..b15cd20 100644 --- a/wayang-platforms/wayang-jdbc-template/pom.xml +++ b/wayang-platforms/wayang-jdbc-template/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang-platforms</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-jdbc-template</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Platform JDBC Template</name> <description> @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-commons</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -55,17 +55,17 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.hsqldb</groupId> diff --git a/wayang-platforms/wayang-postgres/pom.xml b/wayang-platforms/wayang-postgres/pom.xml index 2317986..3186c5e 100644 --- a/wayang-platforms/wayang-postgres/pom.xml +++ b/wayang-platforms/wayang-postgres/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang-platforms</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-postgres</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Platform Postgres</name> <description> @@ -48,12 +48,12 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-jdbc-template</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/wayang-platforms/wayang-spark/pom.xml b/wayang-platforms/wayang-spark/pom.xml index 1098d04..b4fd7fb 100644 --- a/wayang-platforms/wayang-spark/pom.xml +++ b/wayang-platforms/wayang-spark/pom.xml @@ -19,15 +19,20 @@ --> <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> + <parent> <artifactId>wayang-platforms</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-spark</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Platform Spark</name> <description> @@ -43,18 +48,18 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <!-- wayang-java is required to allow for direct communication between spark and java --> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> diff --git a/wayang-platforms/wayang-spark/scala_12 b/wayang-platforms/wayang-spark/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-platforms/wayang-spark/wayang-spark_2.11/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-platforms/wayang-spark/wayang-spark_2.11/pom.xml index c370637..c3f5359 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-platforms/wayang-spark/wayang-spark_2.11/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-spark</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-spark_2.11</artifactId> </project> diff --git a/wayang-platforms/wayang-spark/wayang-spark_2.11/scala_11 b/wayang-platforms/wayang-spark/wayang-spark_2.11/scala_11 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-platforms/wayang-spark/wayang-spark_2.11/src b/wayang-platforms/wayang-spark/wayang-spark_2.11/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-platforms/wayang-spark/wayang-spark_2.11/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-platforms/wayang-spark/wayang-spark_2.12/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-platforms/wayang-spark/wayang-spark_2.12/pom.xml index c370637..151d50e 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-platforms/wayang-spark/wayang-spark_2.12/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-spark</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-spark_2.12</artifactId> </project> diff --git a/wayang-platforms/wayang-spark/wayang-spark_2.12/scala_12 b/wayang-platforms/wayang-spark/wayang-spark_2.12/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-platforms/wayang-spark/wayang-spark_2.12/src b/wayang-platforms/wayang-spark/wayang-spark_2.12/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-platforms/wayang-spark/wayang-spark_2.12/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-platforms/wayang-sqlite3/pom.xml b/wayang-platforms/wayang-sqlite3/pom.xml index 1ef0548..4727024 100644 --- a/wayang-platforms/wayang-sqlite3/pom.xml +++ b/wayang-platforms/wayang-sqlite3/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang-platforms</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-sqlite3</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Platform SQLite3</name> <description> @@ -44,17 +44,17 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-jdbc-template</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.xerial</groupId> diff --git a/wayang-plugins/pom.xml b/wayang-plugins/pom.xml index fd698f1..7178326 100644 --- a/wayang-plugins/pom.xml +++ b/wayang-plugins/pom.xml @@ -23,11 +23,11 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-plugins</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wayang Extensions</name> diff --git a/wayang-plugins/wayang-iejoin/pom.xml b/wayang-plugins/wayang-iejoin/pom.xml index e5b6f4f..f3cefc3 100644 --- a/wayang-plugins/wayang-iejoin/pom.xml +++ b/wayang-plugins/wayang-iejoin/pom.xml @@ -12,15 +12,20 @@ --> <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> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-iejoin</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <properties> <java-module-name>org.apache.wayang.extensions.iejoin</java-module-name> @@ -30,22 +35,22 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-core</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-basic</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-spark</artifactId> - <version>0.6.1-SNAPSHOT</version> + <artifactId>wayang-spark_${scala.mayor.version}</artifactId> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> diff --git a/wayang-plugins/wayang-iejoin/scala_12 b/wayang-plugins/wayang-iejoin/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/pom.xml index c370637..ab6d919 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-iejoin</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-iejoin_2.11</artifactId> </project> diff --git a/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/scala_11 b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/scala_11 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/src b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/pom.xml index c370637..8102f60 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-iejoin</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-iejoin_2.12</artifactId> </project> diff --git a/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/scala_12 b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/src b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-profiler/pom.xml b/wayang-profiler/pom.xml index 5bb13bc..1f9b0fd 100644 --- a/wayang-profiler/pom.xml +++ b/wayang-profiler/pom.xml @@ -19,15 +19,20 @@ --> <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> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-profiler</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Profiler</name> <description>Wayang Profiler allow to know the weight of each operator</description> @@ -41,7 +46,7 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-commons</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -56,23 +61,23 @@ </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-spark</artifactId> - <version>0.6.1-SNAPSHOT</version> + <artifactId>wayang-spark_${scala.mayor.version}</artifactId> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-postgres</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-sqlite3</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> @@ -82,7 +87,7 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-utils-profile-db</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </dependency> </dependencies> <profiles> @@ -91,7 +96,7 @@ <dependencies> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-graphchi</artifactId> + <artifactId>wayang-graphchi_2.11</artifactId> <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/wayang-profiler/scala_12 b/wayang-profiler/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-profiler/wayang-profiler_2.11/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-profiler/wayang-profiler_2.11/pom.xml index c370637..368a51b 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-profiler/wayang-profiler_2.11/pom.xml @@ -17,24 +17,16 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> +<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";> + <parent> + <artifactId>wayang-profiler</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wayang-profiler_2.11</artifactId> </project> diff --git a/wayang-profiler/wayang-profiler_2.11/scala_11 b/wayang-profiler/wayang-profiler_2.11/scala_11 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-profiler/wayang-profiler_2.11/src b/wayang-profiler/wayang-profiler_2.11/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-profiler/wayang-profiler_2.11/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-profiler/wayang-profiler_2.12/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-profiler/wayang-profiler_2.12/pom.xml index c370637..7cc9db7 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-profiler/wayang-profiler_2.12/pom.xml @@ -17,24 +17,17 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-profiler</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-profiler_2.12</artifactId> </project> diff --git a/wayang-profiler/wayang-profiler_2.12/scala_12 b/wayang-profiler/wayang-profiler_2.12/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-profiler/wayang-profiler_2.12/src b/wayang-profiler/wayang-profiler_2.12/src new file mode 120000 index 0000000..5cd551c --- /dev/null +++ b/wayang-profiler/wayang-profiler_2.12/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/wayang-resources/pom.xml b/wayang-resources/pom.xml index 3c3cffd..861a723 100644 --- a/wayang-resources/pom.xml +++ b/wayang-resources/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/wayang-tests-integration/pom.xml b/wayang-tests-integration/pom.xml index 377622b..bddd9d8 100644 --- a/wayang-tests-integration/pom.xml +++ b/wayang-tests-integration/pom.xml @@ -19,15 +19,20 @@ --> <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> + <parent> <artifactId>wayang</artifactId> <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>wayang-tests-integration</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>Wayang Integration Test</name> <description>Wayang integration Tests</description> @@ -43,45 +48,45 @@ <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-flink</artifactId> - <version>0.6.1-SNAPSHOT</version> + <artifactId>wayang-flink_${scala.mayor.version}</artifactId> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-sqlite3</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-postgres</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wayang</groupId> <artifactId>wayang-giraph</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-spark</artifactId> - <version>0.6.1-SNAPSHOT</version> + <artifactId>wayang-spark_${scala.mayor.version}</artifactId> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-api-scala-java</artifactId> - <version>0.6.1-SNAPSHOT</version> + <artifactId>wayang-api-scala-java_${scala.mayor.version}</artifactId> + <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> @@ -212,6 +217,30 @@ <build> <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>process-resources</id> + <phase>process-resources</phase> + <goals> + <goal>resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/test-classes</outputDirectory> + <resources> + <resource> + <directory>${basedir}/src/test/resources</directory> + <includes> + <include>*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> @@ -241,7 +270,6 @@ </excludes> </configuration> </plugin> - </plugins> </build> <profiles> @@ -272,7 +300,7 @@ <dependencies> <dependency> <groupId>org.apache.wayang</groupId> - <artifactId>wayang-graphchi</artifactId> + <artifactId>wayang-graphchi_2.11</artifactId> <version>0.6.0-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/wayang-tests-integration/scala_12 b/wayang-tests-integration/scala_12 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-tests-integration/wayang-tests-integration_2.11/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-tests-integration/wayang-tests-integration_2.11/pom.xml index c370637..c9a9851 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-tests-integration/wayang-tests-integration_2.11/pom.xml @@ -17,24 +17,21 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-tests-integration</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-tests-integration_2.11</artifactId> + <properties> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> + </properties> </project> diff --git a/wayang-tests-integration/wayang-tests-integration_2.11/scala_11 b/wayang-tests-integration/wayang-tests-integration_2.11/scala_11 new file mode 100644 index 0000000..e69de29 diff --git a/wayang-commons/wayang-utils-profile-db/pom.xml b/wayang-tests-integration/wayang-tests-integration_2.12/pom.xml similarity index 54% copy from wayang-commons/wayang-utils-profile-db/pom.xml copy to wayang-tests-integration/wayang-tests-integration_2.12/pom.xml index c370637..3cf39a7 100644 --- a/wayang-commons/wayang-utils-profile-db/pom.xml +++ b/wayang-tests-integration/wayang-tests-integration_2.12/pom.xml @@ -17,24 +17,21 @@ specific language governing permissions and limitations under the License. --> -<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";> - <parent> - <artifactId>wayang-commons</artifactId> - <groupId>org.apache.wayang</groupId> - <version>0.6.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> +<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";> + <parent> + <artifactId>wayang-tests-integration</artifactId> + <groupId>org.apache.wayang</groupId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>wayang-utils-profile-db</artifactId> - - <dependencies> - <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> + <artifactId>wayang-tests-integration_2.12</artifactId> + <properties> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> + </properties> </project> diff --git a/wayang-tests-integration/wayang-tests-integration_2.12/scala_12 b/wayang-tests-integration/wayang-tests-integration_2.12/scala_12 new file mode 100644 index 0000000..e69de29
