Skip to content

Commit ddaade4

Browse files
keilwkeilw
committed
Working on #353 
1 parent adc5e1f commit ddaade4

File tree

14 files changed

+39
-78
lines changed

14 files changed

+39
-78
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
name: Build
2424
command: mvn -B -DskipTests -Dmaven.test.skip clean package
2525
# Then run your tests!
26-
# - run:
27-
# name: Test
28-
# command: mvn test jacoco:report coveralls:report -DsourceEncoding=UTF-8 -P ci
26+
- run:
27+
name: Test
28+
command: mvn test jacoco:report coveralls:report -DsourceEncoding=UTF-8 -P ci
2929

3030
deployment:
3131
# These next lines define a Docker executor: https://circleci.com/docs/2.0/executor-types/

‎moneta-convert/moneta-convert-base/bnd.bnd‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ javac.target: 1.8
66
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=8.0))"
77

88
-buildpath: \
9-
osgi.annotation; version=6.0.0,\
10-
osgi.core; version=6.0,\
11-
osgi.cmpn; version=6.0
9+
osgi.annotation; version=8.0.0,\
10+
osgi.core; version=8.0,\
1211

1312
# JPMS
1413
Automatic-Module-Name: org.javamoney.moneta.convert

‎moneta-convert/moneta-convert-base/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,13 @@
1616
<!-- OSGI support -->
1717
<dependency>
1818
<groupId>org.osgi</groupId>
19-
<artifactId>org.osgi.annotation</artifactId>
19+
<artifactId>osgi.annotation</artifactId>
2020
<scope>provided</scope>
2121
<optional>true</optional>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.osgi</groupId>
25-
<artifactId>org.osgi.compendium</artifactId>
26-
<scope>provided</scope>
27-
<optional>true</optional>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.osgi</groupId>
31-
<artifactId>org.osgi.core</artifactId>
25+
<artifactId>osgi.core</artifactId>
3226
<scope>provided</scope>
3327
<optional>true</optional>
3428
</dependency>

‎moneta-convert/moneta-convert-base/src/main/java/module-info.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import org.javamoney.moneta.convert.IdentityRateProvider;
33

44
/*
5-
Copyright (c) 2012, 2018, Anatole Tresch, Werner Keil and others by the @author tag.
5+
Copyright (c) 2012, 2023, Werner Keil and others by the @author tag.
66
77
Licensed under the Apache License, Version 2.0 (the "License"); you may not
88
use this file except in compliance with the License. You may obtain a copy of
@@ -19,9 +19,8 @@
1919
module org.javamoney.moneta.convert {
2020
exports org.javamoney.moneta.convert;
2121
requires transitive org.javamoney.moneta;
22-
requires static org.osgi.core;
23-
requires static org.osgi.compendium;
24-
requires static org.osgi.annotation;
22+
requires static osgi.core;
23+
requires static osgi.annotation;
2524
provides javax.money.spi.MonetaryConversionsSingletonSpi with DefaultMonetaryConversionsSingletonSpi;
2625
provides javax.money.convert.ExchangeRateProvider with IdentityRateProvider;
2726
uses org.javamoney.moneta.spi.MonetaryAmountProducer;

‎moneta-convert/moneta-convert-ecb/bnd.bnd‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ javac.target: 1.8
66
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=8.0))"
77

88
-buildpath: \
9-
osgi.annotation; version=6.0.0,\
10-
osgi.core; version=6.0,\
11-
osgi.cmpn; version=6.0
9+
osgi.annotation; version=8.0.0,\
10+
osgi.core; version=8.0
1211

1312
-testpath: \
1413
${junit}

‎moneta-convert/moneta-convert-ecb/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,13 @@
2323
<!-- OSGI support -->
2424
<dependency>
2525
<groupId>org.osgi</groupId>
26-
<artifactId>org.osgi.annotation</artifactId>
26+
<artifactId>osgi.core</artifactId>
2727
<scope>provided</scope>
2828
<optional>true</optional>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.osgi</groupId>
32-
<artifactId>org.osgi.compendium</artifactId>
33-
<scope>provided</scope>
34-
<optional>true</optional>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.osgi</groupId>
38-
<artifactId>org.osgi.core</artifactId>
32+
<artifactId>osgi.annotation</artifactId>
3933
<scope>provided</scope>
4034
<optional>true</optional>
4135
</dependency>

‎moneta-convert/moneta-convert-ecb/src/main/java/module-info.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.javamoney.moneta.spi.loader.LoaderService;
22

33
/*
4-
Copyright (c) 2012, 2018, Anatole Tresch, Werner Keil and others by the @author tag.
4+
Copyright (c) 2012, 2023, Werner Keil and others by the @author tag.
55
66
Licensed under the Apache License, Version 2.0 (the "License"); you may not
77
use this file except in compliance with the License. You may obtain a copy of
@@ -19,9 +19,8 @@
1919
opens org.javamoney.moneta.convert.ecb.defaults;
2020
requires java.xml;
2121
requires org.javamoney.moneta.convert;
22-
requires static org.osgi.core;
23-
requires static org.osgi.compendium;
24-
requires static org.osgi.annotation;
22+
requires static osgi.core;
23+
requires static osgi.annotation;
2524
provides javax.money.convert.ExchangeRateProvider with
2625
org.javamoney.moneta.convert.ecb.ECBCurrentRateProvider, org.javamoney.moneta.convert.ecb.ECBHistoric90RateProvider, org.javamoney.moneta.convert.ecb.ECBHistoricRateProvider;
2726
uses LoaderService;

‎moneta-convert/moneta-convert-imf/bnd.bnd‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ javac.target: 1.8
66
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=8.0))"
77

88
-buildpath: \
9-
osgi.annotation; version=6.0.0,\
10-
osgi.core; version=6.0,\
11-
osgi.cmpn; version=6.0
9+
osgi.annotation; version=8.0.0,\
10+
osgi.core; version=8.0
1211

1312
# JPMS
1413
Automatic-Module-Name: org.javamoney.moneta.convert.imf

‎moneta-convert/moneta-convert-imf/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,13 @@
1313
<!-- OSGI support -->
1414
<dependency>
1515
<groupId>org.osgi</groupId>
16-
<artifactId>org.osgi.annotation</artifactId>
16+
<artifactId>osgi.annotation</artifactId>
1717
<scope>provided</scope>
1818
<optional>true</optional>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.osgi</groupId>
22-
<artifactId>org.osgi.compendium</artifactId>
23-
<scope>provided</scope>
24-
<optional>true</optional>
25-
</dependency>
26-
<dependency>
27-
<groupId>org.osgi</groupId>
28-
<artifactId>org.osgi.core</artifactId>
22+
<artifactId>osgi.core</artifactId>
2923
<scope>provided</scope>
3024
<optional>true</optional>
3125
</dependency>

‎moneta-convert/moneta-convert-imf/src/main/java/module-info.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.javamoney.moneta.spi.loader.LoaderService;
22

33
/*
4-
Copyright (c) 2012, 2018, Anatole Tresch, Werner Keil and others by the @author tag.
4+
Copyright (c) 2012, 2023, Werner Keil and others by the @author tag.
55
66
Licensed under the Apache License, Version 2.0 (the "License"); you may not
77
use this file except in compliance with the License. You may obtain a copy of
@@ -18,9 +18,8 @@
1818
module org.javamoney.moneta.convert.imf {
1919
opens org.javamoney.moneta.convert.imf.defaults;
2020
requires org.javamoney.moneta.convert;
21-
requires static org.osgi.core;
22-
requires static org.osgi.compendium;
23-
requires static org.osgi.annotation;
21+
requires static osgi.core;
22+
requires static osgi.annotation;
2423
provides javax.money.convert.ExchangeRateProvider with
2524
org.javamoney.moneta.convert.imf.IMFRateProvider, org.javamoney.moneta.convert.imf.IMFHistoricRateProvider;
2625
uses LoaderService;

0 commit comments

Comments
 (0)