Skip to content

Commit 16f7918

Browse files
ChannyboyChannyboy
authored
Merge pull request #753 from Channyboy/752-updateDeps
Update and fix dependencies to use deps from parent pom/boms + update TCK README
2 parents cdc7534 + 8de33af commit 16f7918

File tree

7 files changed

+106
-120
lines changed

7 files changed

+106
-120
lines changed

‎api/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@
2828

2929
<dependencies>
3030
<dependency>
31-
<groupId>jakarta.enterprise</groupId>
32-
<artifactId>jakarta.enterprise.cdi-api</artifactId>
31+
<groupId>jakarta.platform</groupId>
32+
<artifactId>jakarta.jakartaee-core-api</artifactId>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.osgi</groupId>
3636
<artifactId>org.osgi.annotation.versioning</artifactId>
3737
</dependency>
3838
</dependencies>
39-
4039

4140
</project>

‎pom.xml‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
<inceptionYear>2017</inceptionYear>
3737
<autorelease>false</autorelease>
3838
<version.microprofile.tck.bom>3.0</version.microprofile.tck.bom>
39-
<version.jakarta.cdi>4.0.0</version.jakarta.cdi>
40-
<version.jakarta.ws-rs>3.0.0</version.jakarta.ws-rs>
4139
</properties>
4240

4341
<developers>
@@ -70,35 +68,14 @@
7068
<modules>
7169
<module>api</module>
7270
<module>spec</module>
71+
<module>tck</module>
7372
<module>tck/rest</module>
7473
<module>tck/api</module>
7574
<module>tck/optional</module>
7675
</modules>
7776

7877
<dependencyManagement>
7978
<dependencies>
80-
<dependency>
81-
<groupId>jakarta.ws.rs</groupId>
82-
<artifactId>jakarta.ws.rs-api</artifactId>
83-
<version>${version.jakarta.ws-rs}</version>
84-
<scope>provided</scope>
85-
</dependency>
86-
<dependency>
87-
<groupId>jakarta.enterprise</groupId>
88-
<artifactId>jakarta.enterprise.cdi-api</artifactId>
89-
<version>${version.jakarta.cdi}</version>
90-
<scope>provided</scope>
91-
<exclusions>
92-
<exclusion>
93-
<groupId>jakarta.el</groupId>
94-
<artifactId>jakarta.el-api</artifactId>
95-
</exclusion>
96-
<exclusion>
97-
<groupId>jakarta.ejb</groupId>
98-
<artifactId>jakarta.ejb-api</artifactId>
99-
</exclusion>
100-
</exclusions>
101-
</dependency>
10279
<dependency>
10380
<groupId>org.osgi</groupId>
10481
<artifactId>org.osgi.annotation.versioning</artifactId>
@@ -110,7 +87,7 @@
11087
<artifactId>microprofile-metrics-api</artifactId>
11188
<version>${project.version}</version>
11289
<scope>provided</scope>
113-
</dependency>
90+
</dependency>
11491
</dependencies>
11592
</dependencyManagement>
11693
</project>

‎tck/README.adoc‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2016, 2020 Contributors to the Eclipse Foundation
2+
// Copyright (c) 2016, 2022 Contributors to the Eclipse Foundation
33
//
44
// See the NOTICE file(s) distributed with this work for additional
55
// information regarding copyright ownership.
@@ -19,7 +19,7 @@
1919

2020
= Running the Microprofile Metrics TCK
2121

22-
Any implementation claiming Microprofile Metrics 2.3 compatibility must pass this test suite.
22+
Any implementation claiming Microprofile Metrics 5.0 compatibility must pass this test suite.
2323
The TCK uses `junit`.
2424

2525
If an implementation supports non-mandatory features defined in the specification then the optional TCK
@@ -28,65 +28,77 @@ must be executed to validate compliance.
2828
The optional TCK currently validates the following non-mandatory features:
2929

3030
- REST stat metrics
31+
- Base metrics
3132

3233
== Dependencies
3334

3435
To enable the tests in your Arquillian based test project you need to add the following dependencies:
3536

3637
[source, xml]
3738
----
39+
40+
<!-- versions should correspond to the value specified in the MicroProfile Parent
41+
pom.xml and MicroProfile Parent TCK-BOM pom.xml used by the specified version of MicroProfile Metrics -->
42+
<properties>
43+
<microprofile.metrics.version>5.0.0</microprofile.metrics.version>
44+
<jakartaee.coreprofile.version>10.0.0</jakartaee.coreprofile.version>
45+
<junit.version>4.13.2</junit.version>
46+
<arquillian.version>1.7.0.Alpha12</arquillian.version>
47+
<hamcrest.version>1.3</hamcrest.version>
48+
</properties>
49+
3850
<dependencies>
3951
<dependency>
4052
<groupId>org.eclipse.microprofile.metrics</groupId>
4153
<artifactId>microprofile-metrics-api</artifactId>
42-
<version>3.0.0</version>
54+
<version>${microprofile.metrics.version}</version>
4355
</dependency>
4456
4557
<dependency>
4658
<groupId>org.eclipse.microprofile.metrics</groupId>
4759
<artifactId>microprofile-metrics-rest-tck</artifactId>
48-
<version>3.1</version>
60+
<version>${microprofile.metrics.version}</version>
4961
</dependency>
5062
5163
<dependency>
5264
<groupId>org.eclipse.microprofile.metrics</groupId>
5365
<artifactId>microprofile-metrics-api-tck</artifactId>
54-
<version>3.1</version>
66+
<version>${microprofile.metrics.version}</version>
5567
</dependency>
5668
5769
<dependency>
58-
<groupId>jakarta.enterprise</groupId>
59-
<artifactId>jakarta.enterprise.cdi-api</artifactId>
60-
<version>3.0.0</version>
70+
<groupId>jakarta.platform</groupId>
71+
<artifactId>jakarta.jakartaee-core-api</artifactId>
72+
<version>${jakartaee.coreprofile.version}</version>
6173
<scope>provided</scope>
6274
</dependency>
6375
6476
<dependency>
6577
<groupId>junit</groupId>
6678
<artifactId>junit</artifactId>
67-
<version>4.12</version>
79+
<version>${junit.version}</version>
6880
<scope>test</scope>
6981
</dependency>
7082
7183
<dependency>
7284
<groupId>org.hamcrest</groupId>
7385
<artifactId>hamcrest-all</artifactId>
74-
<version>1.3</version>
86+
<version>${hamcrest.version}</version>
7587
<scope>test</scope>
7688
</dependency>
7789
7890
<dependency>
7991
<groupId>org.jboss.arquillian.junit</groupId>
8092
<artifactId>arquillian-junit-container</artifactId>
81-
<version>1.1.8.Final</version>
93+
<version>${arquillian.version}</version>
8294
<scope>test</scope>
8395
</dependency>
8496
8597
<!-- You can replace this with your choice of container -->
8698
<dependency>
87-
<groupId>org.jboss.arquillian.container</groupId>
88-
<artifactId>arquillian-wlp-managed-8.5</artifactId>
89-
<version>1.0.0.Final-SNAPSHOT</version>
99+
<groupId>io.openliberty.arquillian</groupId>
100+
<artifactId>arquillian-liberty-managed-jakarta</artifactId>
101+
<version>2.1.0</version>
90102
<scope>test</scope>
91103
</dependency>
92104
</dependencies>
@@ -103,14 +115,7 @@ If running the optional TCK module you will need the below *additional* dependen
103115
<dependency>
104116
<groupId>org.eclipse.microprofile.metrics</groupId>
105117
<artifactId>microprofile-metrics-optional-tck</artifactId>
106-
<version>3.1</version>
107-
</dependency>
108-
109-
<dependency>
110-
<groupId>jakarta.ws.rs</groupId>
111-
<artifactId>jakarta.ws.rs-api</artifactId>
112-
<version>3.0.0</version>
113-
<scope>provided</scope>
118+
<version>${microprofile.metrics.version}</version>
114119
</dependency>
115120
116121
----

‎tck/api/pom.xml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<parent>
1313
<!-- This is just for now and will not work if the API has a separate release cycle than the rest. -->
1414
<groupId>org.eclipse.microprofile.metrics</groupId>
15-
<artifactId>microprofile-metrics-parent</artifactId>
15+
<artifactId>microprofile-metrics-tck</artifactId>
1616
<version>5.0.0-SNAPSHOT</version>
17-
<relativePath>../../pom.xml</relativePath>
17+
<relativePath>../pom.xml</relativePath>
1818
</parent>
1919

2020
<artifactId>microprofile-metrics-api-tck</artifactId>
@@ -40,34 +40,23 @@
4040
<artifactId>microprofile-metrics-api</artifactId>
4141
</dependency>
4242
<dependency>
43-
<groupId>jakarta.enterprise</groupId>
44-
<artifactId>jakarta.enterprise.cdi-api</artifactId>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.hamcrest</groupId>
48-
<artifactId>hamcrest-integration</artifactId>
49-
<version>1.2.1</version>
50-
<scope>provided</scope>
43+
<groupId>jakarta.platform</groupId>
44+
<artifactId>jakarta.jakartaee-core-api</artifactId>
5145
</dependency>
5246

5347
<dependency>
5448
<groupId>org.hamcrest</groupId>
5549
<artifactId>hamcrest-all</artifactId>
56-
<version>1.3</version>
57-
<scope>provided</scope>
5850
</dependency>
5951

6052
<!-- Arquillian dependencies -->
6153
<dependency>
6254
<groupId>junit</groupId>
6355
<artifactId>junit</artifactId>
64-
<version>4.12</version>
65-
<scope>compile</scope>
6656
</dependency>
6757
<dependency>
6858
<groupId>org.jboss.arquillian.junit</groupId>
6959
<artifactId>arquillian-junit-container</artifactId>
70-
<scope>compile</scope>
7160
</dependency>
7261

7362
</dependencies>

‎tck/optional/pom.xml‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,15 @@
1919
<parent>
2020
<!-- This is just for now and will not work if the API has a separate release cycle than the rest. -->
2121
<groupId>org.eclipse.microprofile.metrics</groupId>
22-
<artifactId>microprofile-metrics-parent</artifactId>
22+
<artifactId>microprofile-metrics-tck</artifactId>
2323
<version>5.0.0-SNAPSHOT</version>
24-
<relativePath>../../pom.xml</relativePath>
24+
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

2727
<artifactId>microprofile-metrics-optional-tck</artifactId>
2828
<name>MicroProfile Metrics Optional-TCK</name>
2929
<description>MicroProfile Metrics :: Optional-TCK CONTAINS[REST STAT METRIC TESTS]</description>
3030

31-
<properties>
32-
<!-- TODO should come from parent pom -->
33-
<version.rest-assured>4.3.0</version.rest-assured>
34-
<version.shrinkwrap>2.2.4</version.shrinkwrap>
35-
</properties>
36-
3731
<dependencyManagement>
3832
<dependencies>
3933
<dependency>
@@ -52,8 +46,6 @@
5246
<dependency>
5347
<groupId>io.rest-assured</groupId>
5448
<artifactId>rest-assured</artifactId>
55-
<version>${version.rest-assured}</version>
56-
<scope>compile</scope>
5749
</dependency>
5850

5951
<dependency>
@@ -64,20 +56,11 @@
6456
<dependency>
6557
<groupId>org.jboss.shrinkwrap.resolver</groupId>
6658
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
67-
<version>${version.shrinkwrap}</version>
68-
<scope>compile</scope>
69-
<exclusions>
70-
<exclusion>
71-
<groupId>org.jsoup</groupId>
72-
<artifactId>jsoup</artifactId>
73-
</exclusion>
74-
</exclusions>
7559
</dependency>
7660

7761
<dependency>
7862
<groupId>org.jboss.arquillian.junit</groupId>
7963
<artifactId>arquillian-junit-container</artifactId>
80-
<scope>compile</scope>
8164
</dependency>
8265

8366
<dependency>
@@ -86,13 +69,8 @@
8669
</dependency>
8770

8871
<dependency>
89-
<groupId>jakarta.ws.rs</groupId>
90-
<artifactId>jakarta.ws.rs-api</artifactId>
91-
</dependency>
92-
93-
<dependency>
94-
<groupId>jakarta.enterprise</groupId>
95-
<artifactId>jakarta.enterprise.cdi-api</artifactId>
72+
<groupId>jakarta.platform</groupId>
73+
<artifactId>jakarta.jakartaee-core-api</artifactId>
9674
</dependency>
9775

9876
</dependencies>
@@ -117,7 +95,5 @@
11795
</executions>
11896
</plugin>
11997
</plugins>
120-
</build>
121-
122-
98+
</build>
12399
</project>

‎tck/pom.xml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed under the Apache License, Version 2.0 (the
4+
"License"); you may not use this file except in compliance
5+
with the License. You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing,
10+
software distributed under the License is distributed on an
11+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
12+
KIND, either express or implied. See the License for the
13+
specific language governing permissions and limitations
14+
under the License.
15+
-->
16+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<modelVersion>4.0.0</modelVersion>
18+
19+
<parent>
20+
<!-- This is just for now and will not work if the API has a separate release cycle than the rest. -->
21+
<groupId>org.eclipse.microprofile.metrics</groupId>
22+
<artifactId>microprofile-metrics-parent</artifactId>
23+
<version>5.0.0-SNAPSHOT</version>
24+
25+
<relativePath>../pom.xml</relativePath>
26+
</parent>
27+
28+
<artifactId>microprofile-metrics-tck</artifactId>
29+
<name>MicroProfile Metrics TCK</name>
30+
<description>MicroProfile Metrics TCK</description>
31+
<packaging>pom</packaging>
32+
33+
<properties>
34+
<rest-assured.version>4.3.0</rest-assured.version>
35+
<shrinkwrap.version>2.2.4</shrinkwrap.version>
36+
</properties>
37+
38+
<dependencyManagement>
39+
<dependencies>
40+
41+
<dependency>
42+
<groupId>io.rest-assured</groupId>
43+
<artifactId>rest-assured</artifactId>
44+
<version>${rest-assured.version}</version>
45+
</dependency>
46+
47+
<dependency>
48+
<groupId>org.jboss.shrinkwrap.resolver</groupId>
49+
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
50+
<version>${shrinkwrap.version}</version>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>org.jsoup</groupId>
54+
<artifactId>jsoup</artifactId>
55+
</exclusion>
56+
</exclusions>
57+
</dependency>
58+
59+
</dependencies>
60+
</dependencyManagement>
61+
</project>

0 commit comments

Comments
 (0)