Skip to content

Commit

Permalink
Merge pull request #242 from cschneider/osgi-fix
Browse files Browse the repository at this point in the history 
Make sure bundles are always built. Ignore import for javax.annotatio…
  • Loading branch information
@ronmamo
ronmamo authored Jan 12, 2020
2 parents 375a9a9 + d5d4816 commit fb7786b
Showing 1 changed file with 34 additions and 33 deletions.
67 changes: 34 additions & 33 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,6 @@
<id>build</id>
<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -152,31 +144,6 @@
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration>
<instructions>
<Import-Package>
org.jboss.vfs.*;resolution:=optional,
*
</Import-Package>
<Export-Package>
org.reflections.*
</Export-Package>
<Bundle-SymbolicName>org.reflections</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -231,6 +198,40 @@
<target>${jdk.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.5.1</version>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration>
<instructions>
<!-- Do not import javax.annotation as we only need these at compile time -->
<Import-Package>
org.jboss.vfs.*;resolution:=optional,
!javax.annotation,
*
</Import-Package>
<Bundle-SymbolicName>org.reflections</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit fb7786b

Please sign in to comment.