GERONIMO-6758 upgrading guava, testng and some minor changes in bean lookup for producers (mp-health 2.1)
diff --git a/geronimo-health/pom.xml b/geronimo-health/pom.xml
index eec9870..24d6826 100644
--- a/geronimo-health/pom.xml
+++ b/geronimo-health/pom.xml
@@ -21,11 +21,12 @@
<parent>
<artifactId>geronimo-health-parent</artifactId>
<groupId>org.apache.geronimo</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<artifactId>geronimo-health</artifactId>
- <name>Geronimo Health :: MicroProfile</name>
+ <version>1.0.3-SNAPSHOT</version>
+ <name>Geronimo Health :: Microprofile</name>
<properties>
<geronimo-health.Automatic-Module-Name>org.apache.geronimo.microprofile.health</geronimo-health.Automatic-Module-Name>
@@ -85,7 +86,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.8.21</version>
+ <version>6.9.9</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -109,7 +110,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>20.0</version>
+ <version>28.1-jre</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/geronimo-health/src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/GeronimoHealthExtension.java b/geronimo-health/src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/GeronimoHealthExtension.java
index 8d2e6c2..10998a8 100644
--- a/geronimo-health/src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/GeronimoHealthExtension.java
+++ b/geronimo-health/src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/GeronimoHealthExtension.java
@@ -85,9 +85,9 @@
// per spec, checks has everything including liveness and readiness
checks = Stream.concat(Stream.concat(
- beans.stream().map(it -> lookup(it, beanManager)),
- liveness.stream()),
- readiness.stream())
+ beans.stream().map(it -> lookup(it, beanManager)),
+ liveness.stream()),
+ readiness.stream())
.collect(toList());
started = true;
diff --git a/geronimo-health/src/test/dev.xml b/geronimo-health/src/test/dev.xml
new file mode 100644
index 0000000..4191f20
--- /dev/null
+++ b/geronimo-health/src/test/dev.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Dev TCK Run" verbose="2" configfailurepolicy="continue" >
+ <test name="TCK Run">
+ <!--
+ to debug a single test (class or method), comment packages and add <classes>
+ -->
+ <classes>
+ <class name="org.eclipse.microprofile.health.tck.JsonSchemaValidationTest">
+ <methods>
+ </methods>
+ </class>
+ </classes>
+ </test>
+</suite>
diff --git a/geronimo-health/src/test/resources/arquillian.xml b/geronimo-health/src/test/resources/arquillian.xml
index 71adc2b..2687481 100644
--- a/geronimo-health/src/test/resources/arquillian.xml
+++ b/geronimo-health/src/test/resources/arquillian.xml
@@ -24,7 +24,18 @@
<property name="scanningExcludes">
org.osgi,
arquillian,
- microprofile-
+ microprofile-,
+ bsh,
+ btf,
+ jackson,
+ jacorb,
+ json-schema,
+ libphone,
+ mail,
+ msg,
+ snake,
+ guava,
+ uri
</property>
</configuration>
</container>
