From 3c4247eb583106c2b04ec455564bb4d612e9dffa Mon Sep 17 00:00:00 2001 From: Sean Yang Date: Thu, 20 Jun 2024 15:41:07 +0800 Subject: [PATCH] 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 ee6d22318a2..0258304f991 100644 --- a/dubbo-plugin/dubbo-triple-servlet/pom.xml +++ b/dubbo-plugin/dubbo-triple-servlet/pom.xml @@ -56,52 +56,60 @@ - - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-sources - - run - - generate-sources - - - - - - - - - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-sources - - add-source - - generate-sources - - - ${project.build.directory}/generated-sources/java - - - - - - - + + + jdk-version-ge-17 + + [17,) + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + copy-sources + + run + + generate-sources + + + + + + + + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-sources + + add-source + + generate-sources + + + ${project.build.directory}/generated-sources/java + + + + + + + + + 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 bfaf876099d..a31465cc622 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 @@ true + + + + + src/main/resources + + ** + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + + + + + + + + jdk-version-ge-17 + + [17,) + + + + + src/main/resources + + + + + org.apache.maven.plugins + maven-compiler-plugin + + false + + + + + +