Skip to content
This repository was archived by the owner on Sep 13, 2024. It is now read-only.

Commit 6ba74bb

Browse files
committed
Generate OSGi manifest with bnd-maven-plugin
1 parent aa41af4 commit 6ba74bb

File tree

7 files changed

+59
-80
lines changed

7 files changed

+59
-80
lines changed

org.eclipse.sisu.plexus.extender/META-INF/MANIFEST.MF

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Bundle-Name: Sisu-Plexus Extender (Incubation)
2+
Bundle-SymbolicName: org.eclipse.sisu.plexus.extender;singleton:=true
3+
Fragment-Host: org.eclipse.sisu.inject.extender

org.eclipse.sisu.plexus.extender/pom.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,14 @@
3535
</resource>
3636
</resources>
3737
<plugins>
38+
<plugin>
39+
<groupId>biz.aQute.bnd</groupId>
40+
<artifactId>bnd-maven-plugin</artifactId>
41+
</plugin>
3842
<plugin>
3943
<groupId>org.apache.maven.plugins</groupId>
4044
<artifactId>maven-jar-plugin</artifactId>
4145
<executions>
42-
<execution>
43-
<id>default-jar</id>
44-
<configuration>
45-
<archive>
46-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
47-
</archive>
48-
</configuration>
49-
</execution>
5046
<execution>
5147
<id>empty-javadoc</id>
5248
<phase>package</phase>

org.eclipse.sisu.plexus/META-INF/MANIFEST.MF

Lines changed: 0 additions & 53 deletions
This file was deleted.

org.eclipse.sisu.plexus/bnd.bnd

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Bundle-Name: Sisu-Plexus (Incubation)
2+
Bundle-SymbolicName: org.eclipse.sisu.plexus;singleton:=true
3+
Main-Class: org.eclipse.sisu.launch.Main
4+
Export-Package: !org.codehaus.plexus.(classworlds|util).*,\
5+
org.eclipse.sisu.plexus.*,\
6+
org.codehaus.plexus.*
7+
Import-Package: javax.inject,\
8+
org.eclipse.sisu.*,\
9+
com.google.inject;version="1.3",\
10+
com.google.inject.binder;version="1.3",\
11+
com.google.inject.matcher;version="1.3",\
12+
com.google.inject.name;version="1.3",\
13+
com.google.inject.spi;version="1.3",\
14+
com.google.inject.util;version="1.3",\
15+
org.osgi.framework;version="1.5",\
16+
org.codehaus.classworlds,\
17+
org.codehaus.plexus.classworlds.*,\
18+
org.codehaus.plexus.util.*,\
19+
*;resolution:=optional;version="!"

org.eclipse.sisu.plexus/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,8 @@
121121
</resources>
122122
<plugins>
123123
<plugin>
124-
<groupId>org.apache.maven.plugins</groupId>
125-
<artifactId>maven-jar-plugin</artifactId>
126-
<configuration>
127-
<archive>
128-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
129-
</archive>
130-
</configuration>
124+
<groupId>biz.aQute.bnd</groupId>
125+
<artifactId>bnd-maven-plugin</artifactId>
131126
</plugin>
132127
<plugin>
133128
<groupId>org.apache.maven.plugins</groupId>

pom.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,41 @@
142142
</dependency>
143143
</dependencies>
144144
</plugin>
145+
<plugin>
146+
<groupId>biz.aQute.bnd</groupId>
147+
<artifactId>bnd-maven-plugin</artifactId>
148+
<version>6.4.0</version>
149+
<configuration>
150+
<bnd><![CDATA[
151+
Bundle-Copyright: Copyright (c) 2010-present Sonatype, Inc. and others
152+
Bundle-DocURL: http://www.eclipse.org/sisu/
153+
-noextraheaders: true
154+
-snapshot: SNAPSHOT
155+
]]></bnd>
156+
</configuration>
157+
<executions>
158+
<execution>
159+
<id>bnd-process</id>
160+
<goals>
161+
<goal>bnd-process</goal>
162+
</goals>
163+
</execution>
164+
</executions>
165+
</plugin>
145166
<plugin>
146167
<groupId>org.apache.maven.plugins</groupId>
147168
<artifactId>maven-jar-plugin</artifactId>
148169
<version>3.3.0</version>
170+
<executions>
171+
<execution>
172+
<id>default-jar</id>
173+
<configuration>
174+
<archive>
175+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
176+
</archive>
177+
</configuration>
178+
</execution>
179+
</executions>
149180
</plugin>
150181
<plugin>
151182
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)