GERONIMO-6649 extract the common part of the project in a common module
diff --git a/geronimo-health-common/pom.xml b/geronimo-health-common/pom.xml
new file mode 100644
index 0000000..04a1d97
--- /dev/null
+++ b/geronimo-health-common/pom.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+<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">
+ <parent>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-health-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>geronimo-health-common</artifactId>
+ <name>Geronimo Health :: Common</name>
+
+ <properties>
+ <geronimo-health.Automatic-Module-Name>org.apache.geronimo.microprofile.health.common</geronimo-health.Automatic-Module-Name>
+ </properties>
+</project>
\ No newline at end of file
diff --git a/src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseBuilderImpl.java b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseBuilderImpl.java
similarity index 97%
rename from src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseBuilderImpl.java
rename to geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseBuilderImpl.java
index 7e69da6..4301d29 100644
--- a/src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseBuilderImpl.java
+++ b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseBuilderImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.microprofile.impl.health.impl;
+package org.apache.geronimo.microprofile.common.impl;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseImpl.java b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseImpl.java
similarity index 96%
rename from src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseImpl.java
rename to geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseImpl.java
index aa927dd..50b5d62 100644
--- a/src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseImpl.java
+++ b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.microprofile.impl.health.impl;
+package org.apache.geronimo.microprofile.common.impl;
import java.util.Map;
import java.util.Optional;
diff --git a/src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseProviderImpl.java b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseProviderImpl.java
similarity index 94%
rename from src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseProviderImpl.java
rename to geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseProviderImpl.java
index c22c651..b30b86a 100644
--- a/src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseProviderImpl.java
+++ b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/impl/HealthCheckResponseProviderImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.microprofile.impl.health.impl;
+package org.apache.geronimo.microprofile.common.impl;
import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
import org.eclipse.microprofile.health.spi.HealthCheckResponseProvider;
diff --git a/src/main/java/org/apache/geronimo/microprofile/impl/health/jaxrs/HealthChecksEndpoint.java b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/jaxrs/HealthChecksEndpoint.java
similarity index 85%
rename from src/main/java/org/apache/geronimo/microprofile/impl/health/jaxrs/HealthChecksEndpoint.java
rename to geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/jaxrs/HealthChecksEndpoint.java
index bde8326..cf4ec47 100644
--- a/src/main/java/org/apache/geronimo/microprofile/impl/health/jaxrs/HealthChecksEndpoint.java
+++ b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/jaxrs/HealthChecksEndpoint.java
@@ -14,35 +14,40 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.microprofile.impl.health.jaxrs;
+package org.apache.geronimo.microprofile.common.jaxrs;
import static java.util.stream.Collectors.toList;
import java.util.Collection;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.geronimo.microprofile.impl.health.cdi.GeronimoHealthExtension;
+import org.apache.geronimo.microprofile.common.registry.HealthChecksRegistry;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
@Path("health")
-@ApplicationScoped
+// @ApplicationScoped
public class HealthChecksEndpoint {
- @Inject
- private GeronimoHealthExtension extension;
+ private HealthChecksRegistry registry;
+
+ public void setRegistry(final HealthChecksRegistry registry) {
+ this.registry = registry;
+ }
@GET
@Produces(MediaType.APPLICATION_JSON)
public Response getChecks() {
- final List<HealthCheckResponse> checks = extension.getChecks()
+ if (registry == null) {
+ registry = HealthChecksRegistry.load();
+ }
+
+ final List<HealthCheckResponse> checks = registry.getChecks()
.stream()
.map(HealthCheck::call)
.collect(toList());
diff --git a/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/registry/HealthChecksRegistry.java b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/registry/HealthChecksRegistry.java
new file mode 100644
index 0000000..4f01ab1
--- /dev/null
+++ b/geronimo-health-common/src/main/java/org/apache/geronimo/microprofile/common/registry/HealthChecksRegistry.java
@@ -0,0 +1,35 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.microprofile.common.registry;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import org.eclipse.microprofile.health.HealthCheck;
+
+public interface HealthChecksRegistry {
+ Collection<HealthCheck> getChecks();
+
+ static HealthChecksRegistry load() {
+ final Iterator<HealthChecksRegistry> iterator = ServiceLoader.load(HealthChecksRegistry.class).iterator();
+ if (iterator.hasNext()) {
+ return iterator.next();
+ }
+ throw new IllegalStateException("No implementation of HealthChecksRegistry found");
+ }
+}
diff --git a/geronimo-health/pom.xml b/geronimo-health/pom.xml
new file mode 100644
index 0000000..735c77f
--- /dev/null
+++ b/geronimo-health/pom.xml
@@ -0,0 +1,127 @@
+<?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.
+-->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>geronimo-health-parent</artifactId>
+ <groupId>org.apache.geronimo</groupId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>geronimo-health</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <name>Geronimo Health :: Microprofile</name>
+
+ <properties>
+ <geronimo-health.Automatic-Module-Name>org.apache.geronimo.microprofile.health</geronimo-health.Automatic-Module-Name>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-health-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.testng</groupId>
+ <artifactId>arquillian-testng-container</artifactId>
+ <version>1.1.13.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8.21</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.meecrowave</groupId>
+ <artifactId>meecrowave-arquillian</artifactId>
+ <version>1.2.3</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-tck</artifactId>
+ <version>${spec.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <configuration>
+ <dependenciesToScan>
+ <dependency>org.eclipse.microprofile.health:microprofile-health-tck</dependency>
+ </dependenciesToScan>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseProviderImpl.java b/geronimo-health/src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/CdiHealthChecksEndpoint.java
similarity index 60%
copy from src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseProviderImpl.java
copy to geronimo-health/src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/CdiHealthChecksEndpoint.java
index c22c651..c719519 100644
--- a/src/main/java/org/apache/geronimo/microprofile/impl/health/impl/HealthCheckResponseProviderImpl.java
+++ b/geronimo-health/src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/CdiHealthChecksEndpoint.java
@@ -14,14 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.microprofile.impl.health.impl;
+package org.apache.geronimo.microprofile.impl.health.cdi;
-import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
-import org.eclipse.microprofile.health.spi.HealthCheckResponseProvider;
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.Path;
-public class HealthCheckResponseProviderImpl implements HealthCheckResponseProvider {
- @Override
- public HealthCheckResponseBuilder createResponseBuilder() {
- return new HealthCheckResponseBuilderImpl();
+import org.apache.geronimo.microprofile.common.jaxrs.HealthChecksEndpoint;
+
+@Path("health")
+@ApplicationScoped
+public class CdiHealthChecksEndpoint extends HealthChecksEndpoint {
+ @Inject
+ private GeronimoHealthExtension extension;
+
+ @PostConstruct
+ private void init() {
+ setRegistry(extension);
}
}
diff --git a/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
similarity index 95%
rename from src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/GeronimoHealthExtension.java
rename to geronimo-health/src/main/java/org/apache/geronimo/microprofile/impl/health/cdi/GeronimoHealthExtension.java
index 40bc569..78a9b06 100644
--- a/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
@@ -33,10 +33,11 @@
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessBean;
+import org.apache.geronimo.microprofile.common.registry.HealthChecksRegistry;
import org.eclipse.microprofile.health.Health;
import org.eclipse.microprofile.health.HealthCheck;
-public class GeronimoHealthExtension implements Extension {
+public class GeronimoHealthExtension implements Extension, HealthChecksRegistry {
private final Collection<Bean<?>> beans = new ArrayList<>();
private final Collection<CreationalContext<?>> contexts = new ArrayList<>();
private List<HealthCheck> checks;
@@ -70,6 +71,7 @@
}
}
+ @Override
public List<HealthCheck> getChecks() {
return checks;
}
diff --git a/src/main/resources/META-INF/beans.xml b/geronimo-health/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from src/main/resources/META-INF/beans.xml
rename to geronimo-health/src/main/resources/META-INF/beans.xml
diff --git a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/geronimo-health/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
similarity index 100%
rename from src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to geronimo-health/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
diff --git a/geronimo-health/src/main/resources/META-INF/services/org.eclipse.microprofile.health.spi.HealthCheckResponseProvider b/geronimo-health/src/main/resources/META-INF/services/org.eclipse.microprofile.health.spi.HealthCheckResponseProvider
new file mode 100644
index 0000000..5fe87cb
--- /dev/null
+++ b/geronimo-health/src/main/resources/META-INF/services/org.eclipse.microprofile.health.spi.HealthCheckResponseProvider
@@ -0,0 +1 @@
+org.apache.geronimo.microprofile.common.impl.HealthCheckResponseProviderImpl
diff --git a/src/test/resources/arquillian.xml b/geronimo-health/src/test/resources/arquillian.xml
similarity index 100%
rename from src/test/resources/arquillian.xml
rename to geronimo-health/src/test/resources/arquillian.xml
diff --git a/pom.xml b/pom.xml
index 3033af4..44452e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,19 +15,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>20</version>
+ <version>21</version>
</parent>
<groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-health</artifactId>
+ <artifactId>geronimo-health-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
- <name>Geronimo Microprofile Health Implementation</name>
+ <name>Geronimo Health</name>
+ <packaging>pom</packaging>
<description>
Apache Geronimo implementation of the Microprofile Health Specification
@@ -44,6 +49,11 @@
<spec.version>1.0</spec.version>
</properties>
+ <modules>
+ <module>geronimo-health-common</module>
+ <module>geronimo-health</module>
+ </modules>
+
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.health</groupId>
@@ -74,80 +84,6 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.microprofile.config</groupId>
- <artifactId>microprofile-config-api</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency> <!-- issue with the cache key -->
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>2.0.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.testng</groupId>
- <artifactId>arquillian-testng-container</artifactId>
- <version>1.1.13.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.21</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.meecrowave</groupId>
- <artifactId>meecrowave-arquillian</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.microprofile.health</groupId>
- <artifactId>microprofile-health-tck</artifactId>
- <version>${spec.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -155,7 +91,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -163,22 +99,12 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
- <configuration>
- <dependenciesToScan>
- <dependency>org.eclipse.microprofile.health:microprofile-health-tck</dependency>
- </dependenciesToScan>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.1.0</version>
<configuration>
<archive combine.children="append">
<manifestEntries>
- <Automatic-Module-Name>org.apache.geronimo.microprofile.health</Automatic-Module-Name>
+ <Automatic-Module-Name>${geronimo-health.Automatic-Module-Name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
diff --git a/src/main/resources/META-INF/services/org.eclipse.microprofile.health.spi.HealthCheckResponseProvider b/src/main/resources/META-INF/services/org.eclipse.microprofile.health.spi.HealthCheckResponseProvider
deleted file mode 100644
index e8b051a..0000000
--- a/src/main/resources/META-INF/services/org.eclipse.microprofile.health.spi.HealthCheckResponseProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.geronimo.microprofile.impl.health.impl.HealthCheckResponseProviderImpl
