Skip to content

Commit 87cadbd

Browse files
tomas-langertomas-langer
authored
Re-enable Packaging Tests (helidon-io#4412)
* Switch to parsson, native image fixes. * Re-enabled parts of packaging tests that work. Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
1 parent ffd0bcb commit 87cadbd

58 files changed

Lines changed: 765 additions & 510 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dbclient/jsonp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<artifactId>helidon-dbclient</artifactId>
3939
</dependency>
4040
<dependency>
41-
<groupId>org.glassfish</groupId>
42-
<artifactId>jakarta.json</artifactId>
41+
<groupId>org.eclipse.parsson</groupId>
42+
<artifactId>parsson</artifactId>
4343
</dependency>
4444
</dependencies>
4545
</project>

‎dbclient/mongodb/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<artifactId>helidon-dbclient-common</artifactId>
4747
</dependency>
4848
<dependency>
49-
<groupId>org.glassfish</groupId>
50-
<artifactId>jakarta.json</artifactId>
49+
<groupId>org.eclipse.parsson</groupId>
50+
<artifactId>parsson</artifactId>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.mongodb</groupId>

‎dependencies/pom.xml‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
9595
<version.lib.jaxb-runtime>3.0.2</version.lib.jaxb-runtime>
9696
<version.lib.jedis>3.6.3</version.lib.jedis>
97-
<version.lib.jersey>3.0.4</version.lib.jersey>
97+
<version.lib.jersey>3.0.5</version.lib.jersey>
9898
<version.lib.jgit>5.11.1.202105131744-r</version.lib.jgit>
9999
<version.lib.jsonp-impl>2.0.1</version.lib.jsonp-impl>
100100
<version.lib.junit>5.7.0</version.lib.junit>
@@ -140,6 +140,7 @@
140140
<version.lib.opentracing.grpc>0.2.1</version.lib.opentracing.grpc>
141141
<version.lib.opentracing.tracerresolver>0.1.8</version.lib.opentracing.tracerresolver>
142142
<version.lib.perfmark-api>0.23.0</version.lib.perfmark-api>
143+
<version.lib.parsson>1.0.2</version.lib.parsson>
143144
<version.lib.postgresql>42.3.3</version.lib.postgresql>
144145
<version.lib.prometheus>0.9.0</version.lib.prometheus>
145146
<version.lib.slf4j>1.7.32</version.lib.slf4j>
@@ -356,15 +357,14 @@
356357
<version>${version.lib.jakarta.jms-api}</version>
357358
</dependency>
358359
<dependency>
359-
<groupId>org.glassfish</groupId>
360-
<artifactId>jakarta.json</artifactId>
361-
<version>${version.lib.jsonp-impl}</version>
360+
<groupId>org.eclipse.parsson</groupId>
361+
<artifactId>parsson</artifactId>
362+
<version>${version.lib.parsson}</version>
362363
</dependency>
363364
<dependency>
364-
<groupId>org.glassfish</groupId>
365-
<artifactId>jakarta.json</artifactId>
366-
<classifier>module</classifier>
367-
<version>${version.lib.jsonp-impl}</version>
365+
<groupId>org.eclipse.parsson</groupId>
366+
<artifactId>parsson-media</artifactId>
367+
<version>${version.lib.parsson}</version>
368368
</dependency>
369369
<dependency>
370370
<groupId>io.netty</groupId>
@@ -395,13 +395,6 @@
395395
<groupId>org.eclipse</groupId>
396396
<artifactId>yasson</artifactId>
397397
<version>${version.lib.yasson}</version>
398-
<exclusions>
399-
<exclusion>
400-
<!-- we must only have implementation on classpath, not API - module conflict -->
401-
<groupId>jakarta.json</groupId>
402-
<artifactId>jakarta.json-api</artifactId>
403-
</exclusion>
404-
</exclusions>
405398
</dependency>
406399

407400
<!-- Config related -->
@@ -1029,10 +1022,6 @@
10291022
<groupId>org.glassfish.hk2.external</groupId>
10301023
<artifactId>jakarta.inject</artifactId>
10311024
</exclusion>
1032-
<exclusion>
1033-
<groupId>jakarta.json</groupId>
1034-
<artifactId>jakarta.json-api</artifactId>
1035-
</exclusion>
10361025
<exclusion>
10371026
<groupId>com.sun.activation</groupId>
10381027
<artifactId>jakarta.activation</artifactId>
@@ -1081,10 +1070,6 @@
10811070
<groupId>javax.interceptor</groupId>
10821071
<artifactId>javax.interceptor-api</artifactId>
10831072
</exclusion>
1084-
<exclusion>
1085-
<groupId>jakarta.json</groupId>
1086-
<artifactId>jakarta.json-api</artifactId>
1087-
</exclusion>
10881073
<exclusion>
10891074
<groupId>org.glassfish.hk2.external</groupId>
10901075
<artifactId>jakarta.inject</artifactId>

‎etc/scripts/test-packaging-jar.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22
#
3-
# Copyright (c) 2021 Oracle and/or its affiliates.
3+
# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -51,13 +51,13 @@ java -Dexit.on.started=! -jar target/helidon-tests-native-image-se-1.jar
5151
#
5252
# Run MP-1
5353
#
54-
# TODO 3.0.0-JAKARTA - rest client fails during startup
55-
# cd ${WS_DIR}/tests/integration/native-image/mp-1
54+
cd ${WS_DIR}/tests/integration/native-image/mp-1
5655
# Classpath
57-
# java -jar target/helidon-tests-native-image-mp-1.jar
56+
java -jar target/helidon-tests-native-image-mp-1.jar
57+
5858
# Module Path
59-
#java --module-path target/helidon-tests-native-image-mp-1.jar:target/libs \
60-
# --module helidon.tests.nimage.mp/io.helidon.tests.integration.nativeimage.mp1.Mp1Main
59+
java --module-path target/helidon-tests-native-image-mp-1.jar:target/libs \
60+
--module helidon.tests.nimage.mp/io.helidon.tests.integration.nativeimage.mp1.Mp1Main
6161

6262
#
6363
# Run MP-3 (just start and stop)
@@ -67,7 +67,7 @@ cd ${WS_DIR}/tests/integration/native-image/mp-3
6767
java -Dexit.on.started=! -jar target/helidon-tests-native-image-mp-3.jar
6868

6969
# Module Path
70-
# java -Dexit.on.started=! \
71-
# --module-path target/helidon-tests-native-image-mp-3.jar:target/libs \
72-
# --add-modules helidon.tests.nimage.quickstartmp \
73-
# --module io.helidon.microprofile.cdi/io.helidon.microprofile.cdi.Main
70+
java -Dexit.on.started=! \
71+
--module-path target/helidon-tests-native-image-mp-3.jar:target/libs \
72+
--add-modules helidon.tests.nimage.quickstartmp \
73+
--module io.helidon.microprofile.cdi/io.helidon.microprofile.cdi.Main

‎etc/scripts/test-packaging-jlink.sh‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22
#
3-
# Copyright (c) 2021 Oracle and/or its affiliates.
3+
# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -50,38 +50,33 @@ done
5050
# Run tests with classpath and then module path
5151

5252
# Run SE-1 (does not contain module-info.java)
53-
# TODO 3.0.0-JAKARTA - starts and does not stop
54-
# cd ${WS_DIR}/tests/integration/native-image/se-1
55-
# jri_dir=${WS_DIR}/tests/integration/native-image/se-1/target/helidon-tests-native-image-se-1-jri
53+
cd ${WS_DIR}/tests/integration/native-image/se-1
54+
jri_dir=${WS_DIR}/tests/integration/native-image/se-1/target/helidon-tests-native-image-se-1-jri
5655

5756
# Classpath
58-
59-
# ${jri_dir}/bin/start --test
57+
${jri_dir}/bin/start --test
6058

6159
# Run MP-1
62-
# TODO 3.0.0-JAKARTA - rest client fails during startup
63-
# cd ${WS_DIR}/tests/integration/native-image/mp-1
64-
# jri_dir=${WS_DIR}/tests/integration/native-image/mp-1/target/helidon-tests-native-image-mp-1-jri
60+
cd ${WS_DIR}/tests/integration/native-image/mp-1
61+
jri_dir=${WS_DIR}/tests/integration/native-image/mp-1/target/helidon-tests-native-image-mp-1-jri
6562

6663
# Classpath
67-
# ${jri_dir}/bin/start
64+
${jri_dir}/bin/start
6865

6966
# Module Path
70-
# TODO 3.0.0-JAKARTA - rest client fails during startup
71-
# ${jri_dir}/bin/java \
72-
# --module-path ${jri_dir}/app/helidon-tests-native-image-mp-1.jar:${jri_dir}/app/libs \
73-
# --module helidon.tests.nimage.mp/io.helidon.tests.integration.nativeimage.mp1.Mp1Main
67+
${jri_dir}/bin/java \
68+
--module-path ${jri_dir}/app/helidon-tests-native-image-mp-1.jar:${jri_dir}/app/libs \
69+
--module helidon.tests.nimage.mp/io.helidon.tests.integration.nativeimage.mp1.Mp1Main
7470

7571
# Run MP-3 (just start and stop)
7672
cd ${WS_DIR}/tests/integration/native-image/mp-3
7773
jri_dir=${WS_DIR}/tests/integration/native-image/mp-3/target/helidon-tests-native-image-mp-3-jri
7874

7975
# Classpath
80-
# TODO 3.0.0-JAKARTA - java.lang.ClassNotFoundException: org.glassfish.json.jaxrs.JsonValueBodyReader
81-
# ${jri_dir}/bin/start --test
76+
${jri_dir}/bin/start --test
8277

8378
# Module Path
84-
#${jri_dir}/bin/java -Dexit.on.started=! \
85-
# --module-path ${jri_dir}/app/helidon-tests-native-image-mp-3.jar:${jri_dir}/app/libs \
86-
# --add-modules helidon.tests.nimage.quickstartmp \
87-
# --module io.helidon.microprofile.cdi/io.helidon.microprofile.cdi.Main
79+
${jri_dir}/bin/java -Dexit.on.started=! \
80+
--module-path ${jri_dir}/app/helidon-tests-native-image-mp-3.jar:${jri_dir}/app/libs \
81+
--add-modules helidon.tests.nimage.quickstartmp \
82+
--module io.helidon.microprofile.cdi/io.helidon.microprofile.cdi.Main

‎etc/scripts/test-packaging-native.sh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22
#
3-
# Copyright (c) 2021 Oracle and/or its affiliates.
3+
# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ mvn ${MAVEN_ARGS} -e clean install
5353

5454
# Build native images
5555
# mp-2 is too big, waiting for more memory
56-
# TODO 3.0.0-JAKARTA - rest client fails during startup, mp-2 fails build
56+
# Only SE is tested as part of the pipeline for now
5757
# readonly native_image_tests="se-1 mp-1 mp-3"
5858
readonly native_image_tests="se-1"
5959
for native_test in ${native_image_tests}; do
@@ -63,7 +63,5 @@ done
6363

6464
# Run this one because it has no pre-reqs and self-tests
6565
# Uses relative path to read configuration
66-
# TODO 3.0.0-JAKARTA - rest client fails during startup
67-
# readonly native_image_tests="se-1 mp-1 mp-3"
6866
# cd ${WS_DIR}/tests/integration/native-image/mp-1
69-
# ${WS_DIR}/tests/integration/native-image/mp-1/target/helidon-tests-native-image-mp-1
67+
# ${WS_DIR}/tests/integration/native-image/mp-1/target/helidon-tests-native-image-mp-1 || true

‎examples/config/metadata/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141

4242
<dependencies>
4343
<dependency>
44-
<groupId>org.glassfish</groupId>
45-
<artifactId>jakarta.json</artifactId>
44+
<groupId>org.eclipse.parsson</groupId>
45+
<artifactId>parsson</artifactId>
4646
</dependency>
4747
<dependency>
4848
<groupId>io.helidon.config</groupId>

‎examples/media/multipart/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<artifactId>helidon-media-jsonp</artifactId>
5858
</dependency>
5959
<dependency>
60-
<groupId>org.glassfish</groupId>
61-
<artifactId>jakarta.json</artifactId>
60+
<groupId>org.eclipse.parsson</groupId>
61+
<artifactId>parsson</artifactId>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.junit.jupiter</groupId>

‎grpc/client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
<scope>test</scope>
7575
</dependency>
7676
<dependency>
77-
<groupId>org.glassfish</groupId>
78-
<artifactId>jakarta.json</artifactId>
77+
<groupId>org.eclipse.parsson</groupId>
78+
<artifactId>parsson</artifactId>
7979
<scope>test</scope>
8080
</dependency>
8181
<dependency>

‎grpc/metrics/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<scope>test</scope>
6262
</dependency>
6363
<dependency>
64-
<groupId>org.glassfish</groupId>
65-
<artifactId>jakarta.json</artifactId>
64+
<groupId>org.eclipse.parsson</groupId>
65+
<artifactId>parsson</artifactId>
6666
<scope>test</scope>
6767
</dependency>
6868
<dependency>

0 commit comments

Comments
 (0)