Skip to content
Permalink
Browse files
GERONIMO-6758 upgrading guava, testng and some minor changes in bean …
…lookup for producers (mp-health 2.1)
  • Loading branch information
rmannibucau committed Dec 31, 2019
1 parent 46a9a43 commit e6f456dcba7c34c904c33dcd1f10bc0d5c6ff98c
Showing 4 changed files with 51 additions and 8 deletions.
@@ -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>
@@ -85,9 +85,9 @@ void start(@Observes final AfterDeploymentValidation afterDeploymentValidation,

// 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;
@@ -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>
@@ -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>

0 comments on commit e6f456d

Please sign in to comment.