Skip to content

Commit 845f208

Browse files
committed
Generate OSGi manifest with Apache Felix Plugin
Replaces Bundlor plugin due to dependency resolution issues.
1 parent 276c495 commit 845f208

1 file changed

Lines changed: 10 additions & 48 deletions

File tree

pom.xml

Lines changed: 10 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<groupId>com.github.docker-java</groupId>
1111
<artifactId>docker-java</artifactId>
12-
<packaging>jar</packaging>
12+
<packaging>bundle</packaging>
1313
<version>3.1.0-SNAPSHOT</version>
1414

1515
<name>docker-java</name>
@@ -280,19 +280,6 @@
280280
</repository>
281281
</distributionManagement>
282282

283-
<pluginRepositories>
284-
<!--<pluginRepository>-->
285-
<!--<id>eclipse.virgo.build.bundles.release</id>-->
286-
<!--<name>Eclipse Virgo Build</name>-->
287-
<!--<url>http://build.eclipse.org/rt/virgo/maven/bundles/release</url>-->
288-
<!--</pluginRepository>-->
289-
<pluginRepository>
290-
<id>com.springsource.repository.bundles.external</id>
291-
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
292-
<url>http://repository.springsource.com/maven/bundles/external</url>
293-
</pluginRepository>
294-
</pluginRepositories>
295-
296283
<build>
297284
<pluginManagement>
298285
<plugins>
@@ -319,11 +306,6 @@
319306
<groupId>org.apache.maven.plugins</groupId>
320307
<artifactId>maven-jar-plugin</artifactId>
321308
<version>${maven-jar-plugin.version}</version>
322-
<configuration>
323-
<archive>
324-
<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
325-
</archive>
326-
</configuration>
327309
<executions>
328310
<execution>
329311
<goals>
@@ -457,36 +439,16 @@
457439
<groupId>org.apache.maven.plugins</groupId>
458440
<artifactId>maven-source-plugin</artifactId>
459441
</plugin>
460-
461-
<plugin>
462-
<groupId>org.eclipse.virgo.bundlor</groupId>
463-
<artifactId>org.eclipse.virgo.bundlor.maven</artifactId>
464-
<version>${maven-bundlor-plugin.version}</version>
465-
<executions>
466-
<execution>
467-
<id>bundlor</id>
468-
<goals>
469-
<goal>bundlor</goal>
470-
</goals>
471-
<configuration>
472-
<failOnWarnings>true</failOnWarnings>
473-
</configuration>
474-
</execution>
475-
</executions>
476-
</plugin>
477-
478442
<plugin>
479-
<groupId>org.codehaus.mojo</groupId>
480-
<artifactId>build-helper-maven-plugin</artifactId>
481-
<version>${maven-build-helper-plugin.version}</version>
482-
<executions>
483-
<execution>
484-
<id>parse-version</id>
485-
<goals>
486-
<goal>parse-version</goal>
487-
</goals>
488-
</execution>
489-
</executions>
443+
<groupId>org.apache.felix</groupId>
444+
<artifactId>maven-bundle-plugin</artifactId>
445+
<extensions>true</extensions>
446+
<configuration>
447+
<instructions>
448+
<Export-Package>!com.github.dockerjava.jaxrs.*,!com.github.dockerjava.netty.*,com.github.dockerjava.*</Export-Package>
449+
<Import-Package>org.newsclub.net.unix;resolution:="optional",*</Import-Package>
450+
</instructions>
451+
</configuration>
490452
</plugin>
491453
</plugins>
492454
</build>

0 commit comments

Comments
 (0)