Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Maven Bundle Plugin #832

Merged
merged 1 commit into from
Jan 8, 2025
Merged

Remove Maven Bundle Plugin #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions connection.impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<version>6.0.1-SNAPSHOT</version>
</parent>
<artifactId>connection.impl</artifactId>
<packaging>bundle</packaging>
<description>A configurable reference implementation of connections</description>
<name>EcChronos Connection Implementation</name>

Expand Down Expand Up @@ -72,29 +71,4 @@
</dependency>

</dependencies>

<build>
<plugins>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<unpackBundle>true</unpackBundle>
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Import-Package><![CDATA[
net.jcip.annotations;resolution:=optional,
*
]]>
</Import-Package>
<Export-Package>
com.ericsson.bss.cassandra.ecchronos.connection.impl.*,
org.apache.cassandra.driver.internal.metrics.micrometer.*
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
6 changes: 0 additions & 6 deletions connection/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<version>6.0.1-SNAPSHOT</version>
</parent>
<artifactId>connection</artifactId>
<packaging>bundle</packaging>
<description>Interfaces that ecChronos rely on to connect to Apache Cassandra</description>
<name>EcChronos Connection</name>

Expand Down Expand Up @@ -68,11 +67,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Expand Down
13 changes: 0 additions & 13 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<version>6.0.1-SNAPSHOT</version>
</parent>
<artifactId>core</artifactId>
<packaging>bundle</packaging>
<description>Core package for scheduling and repairs</description>
<name>EcChronos Core</name>

Expand Down Expand Up @@ -160,18 +159,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<unpackBundle>true</unpackBundle>
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Export-Package>com.ericsson.bss.cassandra.ecchronos.core.*</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
18 changes: 0 additions & 18 deletions fm.impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<version>6.0.1-SNAPSHOT</version>
</parent>
<artifactId>fm.impl</artifactId>
<packaging>bundle</packaging>
<description>A reference implementation of the fault reporter using logging to report faults</description>
<name>EcChronos Fault Management Implementation</name>

Expand Down Expand Up @@ -52,21 +51,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<unpackBundle>true</unpackBundle>
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Import-Package>*</Import-Package>
<Export-Package>com.ericsson.bss.cassandra.ecchronos.fm.impl.*</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
13 changes: 0 additions & 13 deletions fm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<version>6.0.1-SNAPSHOT</version>
</parent>
<artifactId>fm</artifactId>
<packaging>bundle</packaging>
<description>Interfaces that ecChronos rely on for fault reporting</description>
<name>EcChronos Fault Management</name>

Expand All @@ -46,18 +45,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<unpackBundle>true</unpackBundle>
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Export-Package>com.ericsson.bss.cassandra.ecchronos.fm.*</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
20 changes: 0 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
<mockito.core.version>5.14.2</mockito.core.version>
<org.apache.commons.io.version>2.18.0</org.apache.commons.io.version>
<org.apache.commons.commons-compress.version>1.27.1</org.apache.commons.commons-compress.version>
<org.apache.felix.scr.version>2.2.12</org.apache.felix.scr.version>
<org.apache.httpcomponents.client.version>5.4.1</org.apache.httpcomponents.client.version>
<org.bouncycastle.bcpkix-jdk18on.version>1.79</org.bouncycastle.bcpkix-jdk18on.version>
<org.hdrhistogram.version>2.2.2</org.hdrhistogram.version>
Expand All @@ -95,7 +94,6 @@
<!-- Plugin versions -->
<com.mycila.license-maven-plugin.version>4.6</com.mycila.license-maven-plugin.version>
<io.fabric8.docker-maven-plugin.version>0.45.1</io.fabric8.docker-maven-plugin.version>
<org.apache.felix.maven-bundle-plugin.version>6.0.0</org.apache.felix.maven-bundle-plugin.version>
<org.apache.maven.plugin.maven-jxr-plugin.version>3.6.0</org.apache.maven.plugin.maven-jxr-plugin.version>
<org.apache.maven.plugins.maven-assembly-plugin.version>3.7.1</org.apache.maven.plugins.maven-assembly-plugin.version>
<org.apache.maven.plugins-maven-checkstyle-plugin.version>3.6.0</org.apache.maven.plugins-maven-checkstyle-plugin.version>
Expand Down Expand Up @@ -468,13 +466,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>${org.apache.felix.scr.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject-api</artifactId>
Expand Down Expand Up @@ -601,12 +592,6 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${org.apache.felix.maven-bundle-plugin.version}</version>
</plugin>

<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
Expand Down Expand Up @@ -742,11 +727,6 @@ limitations under the License.
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand Down
Loading