feature: adapter GraalVM of Seata module. (#3161)

feature: adapter GraaLVM of Seata module.
alibaba · Feb 22, 2023 · 48ff5d1 · 48ff5d1
1 parent d5558a9
commit 48ff5d1
Show file tree

Hide file tree

Showing 14 changed files with 230 additions and 52 deletions.
diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>2022.0.0.0-RC1</revision>
+        <revision>2022.0.0.0-RC2</revision>
 
         <!-- Spring Cloud -->
         <spring.cloud.version>2022.0.0</spring.cloud.version>

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
@@ -18,9 +18,9 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <revision>2022.0.0.0-RC1</revision>
+        <revision>2022.0.0.0-RC2</revision>
         <sentinel.version>1.8.6</sentinel.version>
-        <seata.version>1.6.1</seata.version>
+        <seata.version>1.7.0-native-rc2</seata.version>
         <nacos.client.version>2.2.1-RC</nacos.client.version>
         <spring.context.support.version>1.0.11</spring.context.support.version>
 

diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml
@@ -35,12 +35,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.10</version>
-        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -54,6 +48,50 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.graalvm.buildtools</groupId>
+                <artifactId>native-maven-plugin</artifactId>
+                <configuration>
+                    <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+                    <metadataRepository>
+                        <enabled>true</enabled>
+                    </metadataRepository>
+                    <requiredVersion>22.3</requiredVersion>
+                    <buildArgs>
+                        --initialize-at-build-time=ch.qos.logback.classic.Logger
+                        --initialize-at-build-time=ch.qos.logback.core.status.InfoStatus
+                        --initialize-at-build-time=ch.qos.logback.core.status.StatusBase
+                        --initialize-at-build-time=org.slf4j.LoggerFactory
+                        --initialize-at-build-time=ch.qos.logback.core.CoreConstants
+                        --initialize-at-build-time=org.slf4j.MDC
+                        --initialize-at-build-time=ch.qos.logback.classic.Level
+                        --initialize-at-build-time=ch.qos.logback.core.util.Loader
+                        --initialize-at-build-time=ch.qos.logback.core.util.StatusPrinter
+                        --initialize-at-run-time=io.netty.channel.epoll.Epoll
+                        --initialize-at-run-time=io.netty.channel.epoll.Native
+                        --initialize-at-run-time=io.netty.channel.epoll.EpollEventLoop
+                        --initialize-at-run-time=io.netty.channel.epoll.EpollEventArray
+                        --initialize-at-run-time=io.netty.channel.DefaultFileRegion
+                        --initialize-at-run-time=io.netty.channel.kqueue.KQueueEventArray
+                        --initialize-at-run-time=io.netty.channel.kqueue.KQueueEventLoop
+                        --initialize-at-run-time=io.netty.channel.kqueue.Native
+                        --initialize-at-run-time=io.netty.channel.unix.Errors
+                        --initialize-at-run-time=io.netty.channel.unix.IovArray
+                        --initialize-at-run-time=io.netty.channel.unix.Limits
+                        --initialize-at-run-time=io.netty.util.internal.logging.Log4JLogger
+                        --initialize-at-run-time=io.netty.channel.unix.Socket
+                        --initialize-at-run-time=io.netty.channel.ChannelHandlerMask
+                    </buildArgs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>add-reachability-metadata</id>
+                        <goals>
+                            <goal>add-reachability-metadata</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

diff --git a/...ample/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java b/...ample/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
@@ -32,12 +32,13 @@
 @Configuration
 public class DatabaseConfiguration {
 
-	@Bean
-	@Primary
-	@ConfigurationProperties("spring.datasource")
-	public DataSource storageDataSource() {
-		return new DruidDataSource();
-	}
+//  druid don't support GraalVM now because of there is CGlib proxy
+//	@Bean
+//	@Primary
+//	@ConfigurationProperties("spring.datasource")
+//	public DataSource storageDataSource() {
+//		return new DruidDataSource();
+//	}
 
 	@Bean
 	public JdbcTemplate jdbcTemplate(DataSource dataSource) {

diff --git a/...g-cloud-alibaba-examples/seata-example/account-service/src/main/resources/application.yml b/...g-cloud-alibaba-examples/seata-example/account-service/src/main/resources/application.yml
@@ -21,15 +21,16 @@ spring:
     allow-bean-definition-overriding: true
   datasource:
     name: storageDataSource
-    type: com.alibaba.druid.pool.DruidDataSource
+#    druid don't support GraalVM now because of there is CGlib proxy
+#    type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://${base.config.mdb.hostname}:${base.config.mdb.port}/${base.config.mdb.dbname}?useSSL=false&serverTimezone=UTC
     username: ${base.config.mdb.username}
     password: ${base.config.mdb.password}
-    druid:
-      max-active: 20
-      min-idle: 2
-      initial-size: 2
+#    druid:
+#      max-active: 20
+#      min-idle: 2
+#      initial-size: 2
 
 seata:
   enabled: true

diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml
@@ -46,6 +46,50 @@
 
     <build>
         <plugins>
+			<plugin>
+				<groupId>org.graalvm.buildtools</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<configuration>
+					<classesDirectory>${project.build.outputDirectory}</classesDirectory>
+					<metadataRepository>
+						<enabled>true</enabled>
+					</metadataRepository>
+					<requiredVersion>22.3</requiredVersion>
+					<buildArgs>
+						--initialize-at-build-time=ch.qos.logback.classic.Logger
+						--initialize-at-build-time=ch.qos.logback.core.status.InfoStatus
+						--initialize-at-build-time=ch.qos.logback.core.status.StatusBase
+						--initialize-at-build-time=org.slf4j.LoggerFactory
+						--initialize-at-build-time=ch.qos.logback.core.CoreConstants
+						--initialize-at-build-time=org.slf4j.MDC
+						--initialize-at-build-time=ch.qos.logback.classic.Level
+						--initialize-at-build-time=ch.qos.logback.core.util.Loader
+						--initialize-at-build-time=ch.qos.logback.core.util.StatusPrinter
+						--initialize-at-run-time=io.netty.channel.epoll.Epoll
+						--initialize-at-run-time=io.netty.channel.epoll.Native
+						--initialize-at-run-time=io.netty.channel.epoll.EpollEventLoop
+						--initialize-at-run-time=io.netty.channel.epoll.EpollEventArray
+						--initialize-at-run-time=io.netty.channel.DefaultFileRegion
+						--initialize-at-run-time=io.netty.channel.kqueue.KQueueEventArray
+						--initialize-at-run-time=io.netty.channel.kqueue.KQueueEventLoop
+						--initialize-at-run-time=io.netty.channel.kqueue.Native
+						--initialize-at-run-time=io.netty.channel.unix.Errors
+						--initialize-at-run-time=io.netty.channel.unix.IovArray
+						--initialize-at-run-time=io.netty.channel.unix.Limits
+						--initialize-at-run-time=io.netty.util.internal.logging.Log4JLogger
+						--initialize-at-run-time=io.netty.channel.unix.Socket
+						--initialize-at-run-time=io.netty.channel.ChannelHandlerMask
+					</buildArgs>
+				</configuration>
+				<executions>
+					<execution>
+						<id>add-reachability-metadata</id>
+						<goals>
+							<goal>add-reachability-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.10</version>
-        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -53,6 +48,50 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.graalvm.buildtools</groupId>
+                <artifactId>native-maven-plugin</artifactId>
+                <configuration>
+                    <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+                    <metadataRepository>
+                        <enabled>true</enabled>
+                    </metadataRepository>
+                    <requiredVersion>22.3</requiredVersion>
+                    <buildArgs>
+                        --initialize-at-build-time=ch.qos.logback.classic.Logger
+                        --initialize-at-build-time=ch.qos.logback.core.status.InfoStatus
+                        --initialize-at-build-time=ch.qos.logback.core.status.StatusBase
+                        --initialize-at-build-time=org.slf4j.LoggerFactory
+                        --initialize-at-build-time=ch.qos.logback.core.CoreConstants
+                        --initialize-at-build-time=org.slf4j.MDC
+                        --initialize-at-build-time=ch.qos.logback.classic.Level
+                        --initialize-at-build-time=ch.qos.logback.core.util.Loader
+                        --initialize-at-build-time=ch.qos.logback.core.util.StatusPrinter
+                        --initialize-at-run-time=io.netty.channel.epoll.Epoll
+                        --initialize-at-run-time=io.netty.channel.epoll.Native
+                        --initialize-at-run-time=io.netty.channel.epoll.EpollEventLoop
+                        --initialize-at-run-time=io.netty.channel.epoll.EpollEventArray
+                        --initialize-at-run-time=io.netty.channel.DefaultFileRegion
+                        --initialize-at-run-time=io.netty.channel.kqueue.KQueueEventArray
+                        --initialize-at-run-time=io.netty.channel.kqueue.KQueueEventLoop
+                        --initialize-at-run-time=io.netty.channel.kqueue.Native
+                        --initialize-at-run-time=io.netty.channel.unix.Errors
+                        --initialize-at-run-time=io.netty.channel.unix.IovArray
+                        --initialize-at-run-time=io.netty.channel.unix.Limits
+                        --initialize-at-run-time=io.netty.util.internal.logging.Log4JLogger
+                        --initialize-at-run-time=io.netty.channel.unix.Socket
+                        --initialize-at-run-time=io.netty.channel.ChannelHandlerMask
+                    </buildArgs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>add-reachability-metadata</id>
+                        <goals>
+                            <goal>add-reachability-metadata</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

diff --git a/...example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java b/...example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
@@ -32,12 +32,13 @@
 @Configuration
 public class DatabaseConfiguration {
 
-	@Bean
-	@Primary
-	@ConfigurationProperties("spring.datasource")
-	public DataSource storageDataSource() {
-		return new DruidDataSource();
-	}
+//  druid don't support GraalVM now because of there is CGlib proxy
+//	@Bean
+//	@Primary
+//	@ConfigurationProperties("spring.datasource")
+//	public DataSource storageDataSource() {
+//		return new DruidDataSource();
+//	}
 
 	@Bean
 	public JdbcTemplate jdbcTemplate(DataSource dataSource) {

diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/application.yml b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/application.yml
@@ -20,15 +20,16 @@ spring:
     allow-bean-definition-overriding: true
   datasource:
     name: storageDataSource
-    type: com.alibaba.druid.pool.DruidDataSource
+#    druid don't support GraalVM now because of there is CGlib proxy
+#    type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://${base.config.mdb.hostname}:${base.config.mdb.port}/${base.config.mdb.dbname}?useSSL=false&serverTimezone=UTC
     username: ${base.config.mdb.username}
     password: ${base.config.mdb.password}
-    druid:
-      max-active: 20
-      min-idle: 2
-      initial-size: 2
+#    druid:
+#      max-active: 20
+#      min-idle: 2
+#      initial-size: 2
 
 seata:
   enabled: true

diff --git a/spring-cloud-alibaba-examples/seata-example/seata-server/pom.xml b/spring-cloud-alibaba-examples/seata-example/seata-server/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <groupId>com.alibaba.cloud</groupId>
-        <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.6.11</version>
+        <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>seata-server</artifactId>
@@ -23,6 +23,16 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <inherited>true</inherited>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

diff --git a/spring-cloud-alibaba-examples/seata-example/seata-server/src/main/resources/application.yml b/spring-cloud-alibaba-examples/seata-example/seata-server/src/main/resources/application.yml
@@ -52,6 +52,7 @@ seata:
       cluster: default
       username: nacos
       password: nacos
+      group: DEFAULT_GROUP
   store:
     # support: file 、 db 、 redis
     mode: db

diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml
@@ -34,11 +34,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.10</version>
-        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -52,6 +47,50 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.graalvm.buildtools</groupId>
+                <artifactId>native-maven-plugin</artifactId>
+                <configuration>
+                    <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+                    <metadataRepository>
+                        <enabled>true</enabled>
+                    </metadataRepository>
+                    <requiredVersion>22.3</requiredVersion>
+                    <buildArgs>
+                        --initialize-at-build-time=ch.qos.logback.classic.Logger
+                        --initialize-at-build-time=ch.qos.logback.core.status.InfoStatus
+                        --initialize-at-build-time=ch.qos.logback.core.status.StatusBase
+                        --initialize-at-build-time=org.slf4j.LoggerFactory
+                        --initialize-at-build-time=ch.qos.logback.core.CoreConstants
+                        --initialize-at-build-time=org.slf4j.MDC
+                        --initialize-at-build-time=ch.qos.logback.classic.Level
+                        --initialize-at-build-time=ch.qos.logback.core.util.Loader
+                        --initialize-at-build-time=ch.qos.logback.core.util.StatusPrinter
+                        --initialize-at-run-time=io.netty.channel.epoll.Epoll
+                        --initialize-at-run-time=io.netty.channel.epoll.Native
+                        --initialize-at-run-time=io.netty.channel.epoll.EpollEventLoop
+                        --initialize-at-run-time=io.netty.channel.epoll.EpollEventArray
+                        --initialize-at-run-time=io.netty.channel.DefaultFileRegion
+                        --initialize-at-run-time=io.netty.channel.kqueue.KQueueEventArray
+                        --initialize-at-run-time=io.netty.channel.kqueue.KQueueEventLoop
+                        --initialize-at-run-time=io.netty.channel.kqueue.Native
+                        --initialize-at-run-time=io.netty.channel.unix.Errors
+                        --initialize-at-run-time=io.netty.channel.unix.IovArray
+                        --initialize-at-run-time=io.netty.channel.unix.Limits
+                        --initialize-at-run-time=io.netty.util.internal.logging.Log4JLogger
+                        --initialize-at-run-time=io.netty.channel.unix.Socket
+                        --initialize-at-run-time=io.netty.channel.ChannelHandlerMask
+                    </buildArgs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>add-reachability-metadata</id>
+                        <goals>
+                            <goal>add-reachability-metadata</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>