Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #774 from gemmellr/AMQ-7442-fix-build-warnings 

AMQ-7442: fix duplicate plugin declaration build warnings
This commit is contained in:
Jean-Baptiste Onofré 2022-02-18 09:14:50 +01:00 committed by GitHub
parent a4b396db91 bd23fef5da
commit b9f6efbf85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
activemq-karaf/pom.xml
View File

@ -149,6 +149,27 @@
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
<Import-Package>
!com.google.errorprone.annotations,
!com.google.errorprone.annotations.concurrent,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console;version="[2,4)",
org.apache.karaf.shell.console.commands;version="[2,4)",
*
</Import-Package>
<Private-Package>
com.google.errorprone.annotations,
com.google.errorprone.annotations.concurrent
</Private-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<Embed-Transitive>true</Embed-Transitive>
<_noee>true</_noee>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -205,31 +226,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
<Import-Package>
!com.google.errorprone.annotations,
!com.google.errorprone.annotations.concurrent,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console;version="[2,4)",
org.apache.karaf.shell.console.commands;version="[2,4)",
*
</Import-Package>
<Private-Package>
com.google.errorprone.annotations,
com.google.errorprone.annotations.concurrent
</Private-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<Embed-Transitive>true</Embed-Transitive>
<_noee>true</_noee>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>

24
activemq-osgi/pom.xml
View File

@ -140,6 +140,13 @@
<inherited>true</inherited>
<configuration>
<instructions>
<Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
<Embed-Dependency>
*;groupId=org.apache.activemq;inline=META-INF/services/*,
*;groupId=org.apache.qpid;inline=META-INF/services/*,
*;groupId=org.apache.xbean;inline=true
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Export-Package>
org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first,
org.apache.activemq.web*;version=${project.version};-noimport:=true;-split-package:=merge-first
@ -284,23 +291,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
<Embed-Dependency>
*;groupId=org.apache.activemq;inline=META-INF/services/*,
*;groupId=org.apache.qpid;inline=META-INF/services/*,
*;groupId=org.apache.xbean;inline=true
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>