Skip to content

Commit b7e182d

Browse files
jansupoljansupol
committed
Update MP Config version 3.0
Signed-off-by: jansupol <jan.supol@oracle.com>
1 parent b4a8f93 commit b7e182d

File tree

5 files changed

+72
-28
lines changed

5 files changed

+72
-28
lines changed

‎ext/microprofile/mp-config/pom.xml‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<artifactId>junit</artifactId>
6868
<scope>test</scope>
6969
</dependency>
70-
71-
<dependency>
72-
<groupId>io.helidon.microprofile.config</groupId>
73-
<artifactId>helidon-microprofile-config</artifactId>
74-
<version>${helidon.version}</version>
75-
<scope>test</scope>
76-
</dependency>
77-
7870
</dependencies>
7971
<build>
8072
<plugins>
@@ -133,6 +125,34 @@
133125
</dependency>
134126
</dependencies>
135127
</profile>
128+
<profile>
129+
<id>smallrye-dependency</id>
130+
<activation>
131+
<jdk>[1.8,17)</jdk>
132+
</activation>
133+
<dependencies>
134+
<dependency>
135+
<groupId>io.smallrye.config</groupId>
136+
<artifactId>smallrye-config</artifactId>
137+
<version>${smallrye.config.version}</version>
138+
<scope>test</scope>
139+
</dependency>
140+
</dependencies>
141+
</profile>
142+
<profile>
143+
<id>helidon-config-dependency</id>
144+
<activation>
145+
<jdk>[17,)</jdk>
146+
</activation>
147+
<dependencies>
148+
<dependency>
149+
<groupId>io.helidon.microprofile.config</groupId>
150+
<artifactId>helidon-microprofile-config</artifactId>
151+
<version>${helidon.config.version}</version>
152+
<scope>test</scope>
153+
</dependency>
154+
</dependencies>
155+
</profile>
136156
</profiles>
137157

138158
</project>

‎pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.eclipse.ee4j</groupId>
2525
<artifactId>project</artifactId>
26-
<version>1.0.6</version>
26+
<version>1.0.7</version>
2727
</parent>
2828

2929
<groupId>org.glassfish.jersey</groupId>
@@ -2087,7 +2087,6 @@
20872087

20882088
<bouncycastle.version>1.68</bouncycastle.version>
20892089
<commons-lang3.version>3.3.2</commons-lang3.version>
2090-
<microprofile.config.version>2.0</microprofile.config.version>
20912090
<checkstyle.mvn.plugin.version>3.1.0</checkstyle.mvn.plugin.version>
20922091
<checkstyle.version>8.28</checkstyle.version>
20932092
<easymock.version>3.3</easymock.version>
@@ -2099,9 +2098,15 @@
20992098
<gae.version>1.9.59</gae.version>
21002099
<grizzly.client.version>1.16</grizzly.client.version>
21012100

2101+
<!-- microprofile -->
2102+
<microprofile.config.version>3.0</microprofile.config.version>
2103+
<microprofile.rest.client.version>3.0</microprofile.rest.client.version>
2104+
<helidon.config.version>3.0.0-M1</helidon.config.version>
2105+
<smallrye.config.version>3.0.0-RC1</smallrye.config.version>
2106+
2107+
21022108
<guava.version>18.0</guava.version>
21032109
<hamcrest.version>1.3</hamcrest.version>
2104-
<helidon.version>1.0.3</helidon.version>
21052110
<xmlunit.version>1.6</xmlunit.version>
21062111
<hk2.osgi.version>org.glassfish.hk2.*;version="[2.5,4)"</hk2.osgi.version>
21072112
<hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,4)"</hk2.jvnet.osgi.version>

‎tests/integration/microprofile/config/helidon/pom.xml‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@
4141
<artifactId>jersey-mp-config</artifactId>
4242
<scope>test</scope>
4343
</dependency>
44-
<dependency>
45-
<groupId>io.helidon.config</groupId>
46-
<artifactId>helidon-config</artifactId>
47-
<version>${helidon.version}</version>
48-
<scope>test</scope>
49-
</dependency>
50-
<dependency>
51-
<groupId>io.helidon.microprofile.config</groupId>
52-
<artifactId>helidon-microprofile-config</artifactId>
53-
<version>${helidon.version}</version>
54-
<scope>test</scope>
55-
</dependency>
5644
<dependency>
5745
<groupId>org.glassfish.jersey.test-framework</groupId>
5846
<artifactId>jersey-test-framework-core</artifactId>
@@ -89,4 +77,35 @@
8977
</plugins>
9078
</build>
9179

80+
<profiles>
81+
<profile>
82+
<id>smallrye-dependency</id>
83+
<activation>
84+
<jdk>[1.8,17)</jdk>
85+
</activation>
86+
<dependencies>
87+
<dependency>
88+
<groupId>io.smallrye.config</groupId>
89+
<artifactId>smallrye-config</artifactId>
90+
<version>${smallrye.config.version}</version>
91+
<scope>test</scope>
92+
</dependency>
93+
</dependencies>
94+
</profile>
95+
<profile>
96+
<id>helidon-config-dependency</id>
97+
<activation>
98+
<jdk>[17,)</jdk>
99+
</activation>
100+
<dependencies>
101+
<dependency>
102+
<groupId>io.helidon.microprofile.config</groupId>
103+
<artifactId>helidon-microprofile-config</artifactId>
104+
<version>${helidon.config.version}</version>
105+
<scope>test</scope>
106+
</dependency>
107+
</dependencies>
108+
</profile>
109+
</profiles>
110+
92111
</project>

‎tests/integration/microprofile/rest-client-tck/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
<version>4.0.1</version>
5757
</dependency>
5858
<dependency>
59-
<groupId>io.smallrye</groupId>
59+
<groupId>io.smallrye.config</groupId>
6060
<artifactId>smallrye-config</artifactId>
61-
<version>1.3.6</version>
61+
<version>${smallrye.config.version}</version>
6262
<scope>test</scope>
6363
<exclusions>
6464
<exclusion>
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>org.eclipse.microprofile.rest.client</groupId>
7272
<artifactId>microprofile-rest-client-tck</artifactId>
73-
<version>3.0</version>
73+
<version>${microprofile.rest.client.version}</version>
7474
<scope>test</scope>
7575
</dependency>
7676
<dependency>

‎tests/integration/microprofile/rest-client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
<scope>test</scope>
4848
</dependency>
4949
<dependency>
50-
<groupId>io.smallrye</groupId>
50+
<groupId>io.smallrye.config</groupId>
5151
<artifactId>smallrye-config</artifactId>
52-
<version>1.3.6</version>
52+
<version>${smallrye.config.version}</version>
5353
<scope>test</scope>
5454
<exclusions>
5555
<exclusion>

0 commit comments

Comments
 (0)