This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 3c4247eb58 Fix Compilation failure in jdk8 (#14350)
3c4247eb58 is described below
commit 3c4247eb583106c2b04ec455564bb4d612e9dffa
Author: Sean Yang <[email protected]>
AuthorDate: Thu Jun 20 15:41:07 2024 +0800
Fix Compilation failure in jdk8 (#14350)
---
dubbo-plugin/dubbo-triple-servlet/pom.xml | 104 +++++++++++----------
.../dubbo-spring-boot-3-autoconfigure/pom.xml | 45 +++++++++
2 files changed, 101 insertions(+), 48 deletions(-)
diff --git a/dubbo-plugin/dubbo-triple-servlet/pom.xml
b/dubbo-plugin/dubbo-triple-servlet/pom.xml
index ee6d22318a..0258304f99 100644
--- a/dubbo-plugin/dubbo-triple-servlet/pom.xml
+++ b/dubbo-plugin/dubbo-triple-servlet/pom.xml
@@ -56,52 +56,60 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-sources</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <target>
- <copy overwrite="true" todir="${sources_directory}">
- <fileset
dir="src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet" />
- </copy>
- <replace token="tri.servlet;" value="tri.servlet.jakarta;">
- <fileset dir="${sources_directory}" />
- </replace>
- <replace token="javax.servlet" value="jakarta.servlet">
- <fileset dir="${sources_directory}" />
- </replace>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <goals>
- <goal>add-source</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <sources>
-
<source>${project.build.directory}/generated-sources/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>jdk-version-ge-17</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-sources</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <copy overwrite="true" todir="${sources_directory}">
+ <fileset
dir="src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet" />
+ </copy>
+ <replace token="tri.servlet;" value="tri.servlet.jakarta;">
+ <fileset dir="${sources_directory}" />
+ </replace>
+ <replace token="javax.servlet" value="jakarta.servlet">
+ <fileset dir="${sources_directory}" />
+ </replace>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-sources</id>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sources>
+
<source>${project.build.directory}/generated-sources/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
b/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
index bfaf876099..a31465cc62 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
@@ -66,4 +66,49 @@
<optional>true</optional>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <skipMain>true</skipMain>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>jdk-version-ge-17</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <skipMain>false</skipMain>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
