This is an automated email from the ASF dual-hosted git repository. doleyzi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push: new c7f358f4bf [INLONG-11315][Audit] Resolve the conflict between the Audit SDK and other components' Protobuf versions (#11316) c7f358f4bf is described below commit c7f358f4bffcf641c36cbbe235db0ade3e14f56c Author: doleyzi <43397300+dole...@users.noreply.github.com> AuthorDate: Thu Oct 10 09:56:07 2024 +0800 [INLONG-11315][Audit] Resolve the conflict between the Audit SDK and other components' Protobuf versions (#11316) --- inlong-audit/audit-common/pom.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/inlong-audit/audit-common/pom.xml b/inlong-audit/audit-common/pom.xml index 3ecbd4b3d7..aaf5048b29 100644 --- a/inlong-audit/audit-common/pom.xml +++ b/inlong-audit/audit-common/pom.xml @@ -67,6 +67,36 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>${plugin.shade.version}</version> + <executions> + <execution> + <id>shade-audit</id> + <goals> + <goal>shade</goal> + </goals> + <phase>package</phase> + + <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> + <artifactSet> + <includes> + <include>org.apache.inlong:*</include> + <include>com.google.protobuf:*</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>com.google.protobuf</pattern> + <shadedPattern>org.apache.inlong.audit.shaded.com.google.protobuf</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> </plugins> <extensions> <extension>