Skip to content

Commit

Permalink
Merge branch 'apache-3.3' into 3.3.0-beta.4-release
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlbumenJ
AlbumenJ committed Jun 20, 2024
2 parents 92e7b5d + 3c4247e commit fc45dd8
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 48 deletions.
104 changes: 56 additions & 48 deletions dubbo-plugin/dubbo-triple-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
45 changes: 45 additions & 0 deletions dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit fc45dd8

Please sign in to comment.