natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.3' into 3.3-restore-packable-method

This commit is contained in:
TomlongTK 2024-06-20 19:04:33 +08:00 committed by GitHub
parent bfbe949240 3c4247eb58
commit 1a1dc2a6f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 101 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
dubbo-plugin/dubbo-triple-servlet/pom.xml
View File

@ -56,52 +56,60 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <profiles>
<plugins> <profile>
<plugin> <id>jdk-version-ge-17</id>
<groupId>org.apache.maven.plugins</groupId> <activation>
<artifactId>maven-antrun-plugin</artifactId> <jdk>[17,)</jdk>
<executions> </activation>
<execution> <build>
<id>copy-sources</id> <plugins>
<goals> <plugin>
<goal>run</goal> <groupId>org.apache.maven.plugins</groupId>
</goals> <artifactId>maven-antrun-plugin</artifactId>
<phase>generate-sources</phase> <executions>
<configuration> <execution>
<target> <id>copy-sources</id>
<copy overwrite="true" todir="${sources_directory}"> <goals>
<fileset dir="src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet" /> <goal>run</goal>
</copy> </goals>
<replace token="tri.servlet;" value="tri.servlet.jakarta;"> <phase>generate-sources</phase>
<fileset dir="${sources_directory}" /> <configuration>
</replace> <target>
<replace token="javax.servlet" value="jakarta.servlet"> <copy overwrite="true" todir="${sources_directory}">
<fileset dir="${sources_directory}" /> <fileset dir="src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet" />
</replace> </copy>
</target> <replace token="tri.servlet;" value="tri.servlet.jakarta;">
</configuration> <fileset dir="${sources_directory}" />
</execution> </replace>
</executions> <replace token="javax.servlet" value="jakarta.servlet">
</plugin> <fileset dir="${sources_directory}" />
<plugin> </replace>
<groupId>org.codehaus.mojo</groupId> </target>
<artifactId>build-helper-maven-plugin</artifactId> </configuration>
<executions> </execution>
<execution> </executions>
<id>add-sources</id> </plugin>
<goals> <plugin>
<goal>add-source</goal> <groupId>org.codehaus.mojo</groupId>
</goals> <artifactId>build-helper-maven-plugin</artifactId>
<phase>generate-sources</phase> <executions>
<configuration> <execution>
<sources> <id>add-sources</id>
<source>${project.build.directory}/generated-sources/java</source> <goals>
</sources> <goal>add-source</goal>
</configuration> </goals>
</execution> <phase>generate-sources</phase>
</executions> <configuration>
</plugin> <sources>
</plugins> <source>${project.build.directory}/generated-sources/java</source>
</build> </sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

45
dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
View File

@ -66,4 +66,49 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </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> </project>