You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/09/30 10:47:31 UTC
[shardingsphere] branch master updated: Supports build with Java 17
(#12858)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 97fae56 Supports build with Java 17 (#12858)
97fae56 is described below
commit 97fae5682c23193e00c5b24631e19f9d4078701e
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Thu Sep 30 18:46:55 2021 +0800
Supports build with Java 17 (#12858)
* Update plugins
* Exclude tests reflected modifiers in shardingsphere-api
* Upgrade bytebuddy 1.10.16 -> 1.10.21
* Exclude tests reflected modifiers in shardingsphere-sql-parser-engine
* Exclude tests reflected modifiers in shardingsphere-proxy-frontend-postgresql
* Exclude tests reflected modifiers in shardingsphere-infra-executor
* Exclude tests reflected modifiers in shardingsphere-proxy-frontend-opengauss
* Upgrade bytebuddy to 1.11.18
* Add TODO for excluded tests
* Add JDK 17 in CI
* Update Lombok to 1.18.20 in examples
* Upgrade Maven plugins in examples
---
.github/workflows/ci.yml | 4 ++++
examples/pom.xml | 6 +++---
pom.xml | 12 +++++------
.../shardingsphere-infra-executor/pom.xml | 23 +++++++++++++++++++++
.../pom.xml | 23 +++++++++++++++++++++
.../pom.xml | 23 +++++++++++++++++++++
shardingsphere-spi/pom.xml | 24 ++++++++++++++++++++++
.../shardingsphere-sql-parser-engine/pom.xml | 23 +++++++++++++++++++++
8 files changed, 129 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7aed1a0..b1903a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,6 +80,10 @@ jobs:
version: 11,
maven_args: "-Dmaven.javadoc.skip=true"
}
+ - {
+ version: 17,
+ maven_args: "-Dmaven.javadoc.skip=true"
+ }
steps:
- name: Cache Maven Repos
uses: actions/cache@v2
diff --git a/examples/pom.xml b/examples/pom.xml
index c6d7aac..144910f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -51,7 +51,7 @@
<h2.version>1.4.196</h2.version>
<slf4j.version>1.7.7</slf4j.version>
<logback.version>1.2.0</logback.version>
- <lombok.version>1.18.16</lombok.version>
+ <lombok.version>1.18.20</lombok.version>
<mybatis.version>3.5.1</mybatis.version>
<mybatis-spring.version>2.0.1</mybatis-spring.version>
@@ -71,8 +71,8 @@
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
- <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
- <maven-source-plugin.version>2.4</maven-source-plugin.version>
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<freemarker.version>2.3.31</freemarker.version>
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
diff --git a/pom.xml b/pom.xml
index 190116f..2bc7269 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
<curator.version>5.1.0</curator.version>
<jetcd.version>0.5.0</jetcd.version>
- <lombok.version>1.18.16</lombok.version>
+ <lombok.version>1.18.20</lombok.version>
<springframework.version>[4.3.6.RELEASE,5.0.0.M1)</springframework.version>
<spring-boot.version>[1.5.20.RELEASE,2.0.0.M1)</spring-boot.version>
@@ -100,7 +100,7 @@
<opengauss.version>2.0.1-compatibility</opengauss.version>
<mssql.version>6.1.7.jre8-preview</mssql.version>
<mariadb-java-client.version>2.4.2</mariadb-java-client.version>
- <bytebuddy.version>1.10.16</bytebuddy.version>
+ <bytebuddy.version>1.11.18</bytebuddy.version>
<elasticjob.version>3.0.0-beta</elasticjob.version>
@@ -118,21 +118,21 @@
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
- <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-site-plugin.version>3.4</maven-site-plugin.version>
- <maven-enforcer-plugin.version>1.4</maven-enforcer-plugin.version>
+ <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
<maven-project-info-reports-plugin.version>2.8</maven-project-info-reports-plugin.version>
<maven-plugin-plugin.version>3.4</maven-plugin-plugin.version>
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
- <maven-source-plugin.version>2.4</maven-source-plugin.version>
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
- <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
<findbugs-maven-plugin.version>3.0.2</findbugs-maven-plugin.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<maven-pmd-plugin.version>3.5</maven-pmd-plugin.version>
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/pom.xml b/shardingsphere-infra/shardingsphere-infra-executor/pom.xml
index 1185097..e624689 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-executor/pom.xml
@@ -60,4 +60,27 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk12+</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- TODO Consider refactoring tests which changed Field's modifiers -->
+ <exclude>org.apache.shardingsphere.infra.executor.sql.log.SQLLoggerTest</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/pom.xml
index e811060..648595b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/pom.xml
@@ -40,4 +40,27 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk12+</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- TODO Consider refactoring tests which changed Field's modifiers -->
+ <exclude>org.apache.shardingsphere.proxy.frontend.opengauss.OpenGaussFrontendEngineTest</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/pom.xml
index 91aef10..525db52 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/pom.xml
@@ -53,4 +53,27 @@
<artifactId>netty-all</artifactId>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk12+</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- TODO Consider refactoring tests which changed Field's modifiers -->
+ <exclude>org.apache.shardingsphere.proxy.frontend.postgresql.command.query.text.PostgreSQLComQueryExecutorTest</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/shardingsphere-spi/pom.xml b/shardingsphere-spi/pom.xml
index 6018dcb..8fd2151 100644
--- a/shardingsphere-spi/pom.xml
+++ b/shardingsphere-spi/pom.xml
@@ -27,4 +27,28 @@
</parent>
<artifactId>shardingsphere-spi</artifactId>
<name>${project.artifactId}</name>
+
+ <profiles>
+ <profile>
+ <id>jdk12+</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- TODO Consider refactoring tests which changed Field's modifiers -->
+ <exclude>org.apache.shardingsphere.spi.ordered.cache.OrderedServicesCacheTest</exclude>
+ <exclude>org.apache.shardingsphere.spi.ordered.OrderedSPIRegistryTest</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/pom.xml b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/pom.xml
index 3b6c4d3..a9b55b3 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/pom.xml
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/pom.xml
@@ -47,4 +47,27 @@
<artifactId>antlr4-runtime</artifactId>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk12+</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- TODO Consider refactoring tests which changed Field's modifiers -->
+ <exclude>org.apache.shardingsphere.sql.parser.api.SQLParserEngineTest</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>