This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 22c6d549ae7ee1221fad4ab0b7340bb67bc60632 Author: Michael Blow <[email protected]> AuthorDate: Tue Oct 3 23:30:18 2023 -0400 [ASTERIXDB-3279] Prepare for move to Java 17 Update plugins as needed for Java 17 class file format compat Change-Id: I88d9357854c5c5807019fea7f818ec768e254748 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17838 Reviewed-by: Michael Blow <[email protected]> Tested-by: Michael Blow <[email protected]> --- asterixdb/asterix-app/pom.xml | 1 + asterixdb/pom.xml | 12 +++++------- .../algebricks/algebricks-tests/pom.xml | 12 ++++++++++++ hyracks-fullstack/hyracks/hyracks-client/pom.xml | 2 ++ .../hyracks-control/hyracks-control-cc/pom.xml | 21 ++++++++++++++++++++- .../hyracks/hyracks-dataflow-common/pom.xml | 1 + .../hyracks/hyracks-dataflow-std/pom.xml | 1 + .../hyracks-integration-tests/pom.xml | 19 +++++++++++++++++++ .../hyracks-examples/hyracks-shutdown-test/pom.xml | 6 +++++- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 1 + hyracks-fullstack/hyracks/hyracks-server/pom.xml | 7 +++++++ .../hyracks/hyracks-storage-am-btree/pom.xml | 1 + .../hyracks-dataflow-common-test/pom.xml | 6 ++++++ .../hyracks-storage-am-bloomfilter-test/pom.xml | 5 +++++ .../hyracks-storage-am-btree-test/pom.xml | 13 +++++++++++++ .../hyracks-storage-am-lsm-btree-test/pom.xml | 16 ++++++++++++++++ .../hyracks-storage-am-lsm-common-test/pom.xml | 9 +++++++++ .../pom.xml | 11 +++++++++++ .../hyracks-storage-am-lsm-rtree-test/pom.xml | 17 +++++++++++++++++ .../hyracks-storage-am-rtree-test/pom.xml | 18 ++++++++++++++++++ .../hyracks-storage-common-test/pom.xml | 8 ++++++++ hyracks-fullstack/hyracks/pom.xml | 2 +- hyracks-fullstack/pom.xml | 10 ++++------ 23 files changed, 183 insertions(+), 16 deletions(-) diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index dfb9224d2e..6c01245a82 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -155,6 +155,7 @@ <usedDependencies combine.children="append"> <usedDependency>org.apache.hadoop:hadoop-common</usedDependency> <usedDependency>org.apache.asterix:asterix-geo</usedDependency> + <usedDependency>org.apache.logging.log4j:log4j-jul</usedDependency> </usedDependencies> <ignoredUnusedDeclaredDependencies> <ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-external-data:zip:*</ignoredUnusedDeclaredDependency> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 265aa37c91..398239d0cc 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -46,8 +46,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <file.encoding>UTF-8</file.encoding> <jvm.extraargs /> - <source.jdk.version>11</source.jdk.version> - <target.jdk.version>11</target.jdk.version> + <release.jdk.version>11</release.jdk.version> <javac.xlint.value>all</javac.xlint.value> <source-format.goal>format</source-format.goal> <source-format.skip>false</source-format.skip> @@ -226,8 +225,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>${source.jdk.version}</source> - <target>${target.jdk.version}</target> + <release>${release.jdk.version}</release> <compilerArgument>-Xlint:${javac.xlint.value}</compilerArgument> </configuration> </plugin> @@ -338,7 +336,7 @@ <version>[3.3.9,)</version> </requireMavenVersion> <requireJavaVersion> - <version>[11,)</version> + <version>[${release.jdk.version},)</version> </requireJavaVersion> </rules> </configuration> @@ -605,7 +603,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.2</version> + <version>3.6.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -615,7 +613,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.6.0</version> + <version>3.9.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml index 34894cb395..4f563a6702 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml @@ -117,16 +117,19 @@ <!-- Dependency management inherited from top-level hyracks --> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -142,6 +145,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -152,11 +156,13 @@ <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-data</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-core</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -167,28 +173,34 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-ipc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-client/pom.xml b/hyracks-fullstack/hyracks/hyracks-client/pom.xml index 9d4ac2775b..3f1e7cf0ec 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-client/pom.xml @@ -89,11 +89,13 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 71f7b44bfa..71139f9d0a 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -26,11 +26,30 @@ <artifactId>hyracks-control</artifactId> <version>0.3.8.2-SNAPSHOT</version> </parent> - <properties> <root.dir>${basedir}/../../..</root.dir> <sonar.sources>pom.xml,src/main/java,src/main/resources</sonar.sources> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <ignoredUsedUndeclaredDependencies combine.children="append"> + <ignoredUsedUndeclaredDependency>io.netty:netty-transport:*</ignoredUsedUndeclaredDependency> + </ignoredUsedUndeclaredDependencies> + </configuration> + <executions> + <execution> + <phase>process-test-classes</phase> + <goals> + <goal>analyze-only</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> + </build> <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml index 6bb86efaf6..4978e85fce 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml @@ -69,6 +69,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml index 8ac7a12e2b..fa668f0c12 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml @@ -74,6 +74,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 90ea341940..e4de6f2692 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@ -56,41 +56,49 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-rtree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-btree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-rtree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -102,11 +110,13 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>com.e-movimento.tinytools</groupId> @@ -122,31 +132,37 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-ipc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -176,15 +192,18 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml index 7117fee233..ab7c63c721 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml @@ -191,27 +191,31 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-ipc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-net/pom.xml b/hyracks-fullstack/hyracks/hyracks-net/pom.xml index f1cdbf8571..fbe7a5b943 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml @@ -50,6 +50,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-ipc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml b/hyracks-fullstack/hyracks/hyracks-server/pom.xml index baa8e3abbd..acf238e732 100644 --- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-server/pom.xml @@ -148,24 +148,29 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-nc-service</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -180,10 +185,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml index 148694dda0..54ee271a5f 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml @@ -103,6 +103,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-dataflow-common-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-dataflow-common-test/pom.xml index 1fd0aedb37..467423a94c 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-dataflow-common-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-dataflow-common-test/pom.xml @@ -48,30 +48,36 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml index 800fcdd560..56658f6be6 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml @@ -48,6 +48,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-bloomfilter</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -59,16 +60,19 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -78,6 +82,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml index 038e346e9f..fbb0589040 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml @@ -49,21 +49,25 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -76,11 +80,13 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -91,10 +97,17 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml index f191a2b2bb..3794e3df45 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml @@ -69,11 +69,13 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-btree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -86,67 +88,81 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-bloomfilter</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml index cbae843fb7..f949dee3bc 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml @@ -48,45 +48,54 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml index 4be352f832..3d6bd7227b 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml @@ -48,6 +48,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -65,31 +66,37 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -101,6 +108,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -111,14 +119,17 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <scope>test</scope> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml index 4db6a64498..9e723caf6f 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml @@ -48,59 +48,76 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-rtree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-rtree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml index 718cb1b18a..6dd7aecea5 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml @@ -49,6 +49,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-rtree</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -60,11 +61,13 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -77,11 +80,13 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -92,10 +97,23 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml index 86561c646e..e84dda0c90 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml @@ -44,37 +44,45 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> \ No newline at end of file diff --git a/hyracks-fullstack/hyracks/pom.xml b/hyracks-fullstack/hyracks/pom.xml index d5289a11f3..5d88a9a81a 100644 --- a/hyracks-fullstack/hyracks/pom.xml +++ b/hyracks-fullstack/hyracks/pom.xml @@ -35,7 +35,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.6.0</version> + <version>3.9.0</version> </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 0601b2f0e3..fe00a348a5 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -49,8 +49,7 @@ <root.dir>${basedir}</root.dir> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <file.encoding>UTF-8</file.encoding> - <source.jdk.version>11</source.jdk.version> - <target.jdk.version>11</target.jdk.version> + <release.jdk.version>11</release.jdk.version> <javac.xlint.value>all</javac.xlint.value> <jvm.extraargs /> <sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath> @@ -566,8 +565,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>${source.jdk.version}</source> - <target>${target.jdk.version}</target> + <release>${release.jdk.version}</release> <compilerArgument>-Xlint:${javac.xlint.value}</compilerArgument> </configuration> </plugin> @@ -677,7 +675,7 @@ <version>[3.3.9,)</version> </requireMavenVersion> <requireJavaVersion> - <version>[11,)</version> + <version>[${release.jdk.version},)</version> </requireJavaVersion> </rules> </configuration> @@ -886,7 +884,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.2</version> + <version>3.6.0</version> </plugin> <plugin> <groupId>org.apache.maven.doxia</groupId>
