Skip to content

Commit 042ef36

Browse files
committed
jsr354-api/issues/63 Fixed OSGI build.
1 parent 81e40c0 commit 042ef36

File tree

2 files changed

+47
-51
lines changed

2 files changed

+47
-51
lines changed

bnd.bnd

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ Automatic-Module-Name: javax.money
1313
Bundle-Version: ${version}.${tstamp}
1414
Bundle-Name: JavaMoney API
1515
Bundle-SymbolicName: javax.money
16-
Bundle-Description: JavaMoney - API
16+
Bundle-Description: JavaMoney - API (Backport)
1717
Bundle-Category: Implementation
18-
Bundle-Copyright: (C) Credit Suisse
18+
Bundle-Copyright: (C) Credit Suisse AG
1919
Bundle-License: JSR 354 Spec Evaluation/Implementation License
20-
Bundle-Vendor: Credit Suisse
21-
Bundle-ContactAddress: [email protected]
22-
Bundle-DocURL: http://javamoney.org
20+
Bundle-Vendor: Credit Suisse AG
21+
Bundle-DocURL: http://www.javamoney.org
2322
Export-Package: \
2423
javax.money,\
2524
javax.money.spi,\
2625
javax.money.convert,\
27-
javax.money.format
28-
26+
javax.money.format

pom.xml

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -275,50 +275,6 @@
275275
</repository>
276276
</repositories>
277277

278-
<build>
279-
<pluginManagement>
280-
<plugins>
281-
<plugin>
282-
<groupId>biz.aQute.bnd</groupId>
283-
<artifactId>bnd-maven-plugin</artifactId>
284-
<version>3.3.0</version>
285-
<dependencies>
286-
<dependency>
287-
<groupId>ch.qos.logback</groupId>
288-
<artifactId>logback-core</artifactId>
289-
<version>1.1.3</version>
290-
</dependency>
291-
<dependency>
292-
<groupId>org.slf4j</groupId>
293-
<artifactId>slf4j-api</artifactId>
294-
<version>1.7.13</version>
295-
</dependency>
296-
</dependencies>
297-
<executions>
298-
<execution>
299-
<goals>
300-
<goal>bnd-process</goal>
301-
</goals>
302-
</execution>
303-
</executions>
304-
</plugin>
305-
</plugins>
306-
</pluginManagement>
307-
<plugins>
308-
<plugin>
309-
<groupId>biz.aQute.bnd</groupId>
310-
<artifactId>bnd-maven-plugin</artifactId>
311-
<executions>
312-
<execution>
313-
<goals>
314-
<goal>bnd-process</goal>
315-
</goals>
316-
</execution>
317-
</executions>
318-
</plugin>
319-
</plugins>
320-
</build>
321-
322278
<profiles>
323279
<profile>
324280
<id>travis</id>
@@ -491,6 +447,31 @@
491447
<!-- ======================================================= -->
492448
<!-- Packaging (OSGi bundle) -->
493449
<!-- ======================================================= -->
450+
<plugin>
451+
<groupId>biz.aQute.bnd</groupId>
452+
<artifactId>bnd-maven-plugin</artifactId>
453+
<version>3.3.0</version>
454+
<dependencies>
455+
<dependency>
456+
<groupId>ch.qos.logback</groupId>
457+
<artifactId>logback-core</artifactId>
458+
<version>1.1.3</version>
459+
</dependency>
460+
<dependency>
461+
<groupId>org.slf4j</groupId>
462+
<artifactId>slf4j-api</artifactId>
463+
<version>1.7.13</version>
464+
</dependency>
465+
</dependencies>
466+
<executions>
467+
<execution>
468+
<goals>
469+
<goal>bnd-process</goal>
470+
</goals>
471+
</execution>
472+
</executions>
473+
</plugin>
474+
494475
<plugin>
495476
<groupId>org.apache.maven.plugins</groupId>
496477
<artifactId>maven-clean-plugin</artifactId>
@@ -510,6 +491,11 @@
510491
<groupId>org.apache.maven.plugins</groupId>
511492
<artifactId>maven-jar-plugin</artifactId>
512493
<version>2.6</version>
494+
<configuration>
495+
<archive>
496+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
497+
</archive>
498+
</configuration>
513499
</plugin>
514500
<plugin>
515501
<groupId>org.apache.maven.plugins</groupId>
@@ -729,6 +715,7 @@
729715
<artifactId>maven-jar-plugin</artifactId>
730716
<configuration>
731717
<archive>
718+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
732719
<manifest>
733720
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
734721
</manifest>
@@ -793,6 +780,17 @@
793780
</execution>
794781
</executions>
795782
</plugin>
783+
<plugin>
784+
<groupId>biz.aQute.bnd</groupId>
785+
<artifactId>bnd-maven-plugin</artifactId>
786+
<executions>
787+
<execution>
788+
<goals>
789+
<goal>bnd-process</goal>
790+
</goals>
791+
</execution>
792+
</executions>
793+
</plugin>
796794
</plugins>
797795
</build>
798796

0 commit comments

Comments
 (0)