diff --git a/spring-geode-project/apache-geode-extensions/apache-geode-extensions.gradle b/spring-geode-project/apache-geode-extensions/apache-geode-extensions.gradle index f99834bc..25499ab8 100644 --- a/spring-geode-project/apache-geode-extensions/apache-geode-extensions.gradle +++ b/spring-geode-project/apache-geode-extensions/apache-geode-extensions.gradle @@ -16,6 +16,4 @@ dependencies { testImplementation "org.apache.geode:geode-membership:$apacheGeodeVersion" testImplementation "org.apache.geode:geode-serialization:$apacheGeodeVersion" - testRuntimeOnly project(':apache-geode-micrometer2') - } diff --git a/spring-geode-project/apache-geode-micrometer2/apache-geode-micrometer2.gradle b/spring-geode-project/apache-geode-micrometer2/apache-geode-micrometer2.gradle deleted file mode 100644 index 407fd853..00000000 --- a/spring-geode-project/apache-geode-micrometer2/apache-geode-micrometer2.gradle +++ /dev/null @@ -1,9 +0,0 @@ -apply plugin: 'io.spring.convention.spring-module' - -description = "Integration for Apache Geode and Micrometer 2" - -dependencies { - - implementation "io.micrometer:micrometer-binders" - -} diff --git a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmGcMetrics.java b/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmGcMetrics.java deleted file mode 100644 index c4bea0f7..00000000 --- a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmGcMetrics.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2017-present the original author or authors. - * - * Licensed 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 - * - * https://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 io.micrometer.core.instrument.binder.jvm; - -import io.micrometer.core.instrument.Tag; - -/** - * Extension of {@link io.micrometer.binder.jvm.JvmGcMetrics} for adapting and repackaging purposes - * as required by Apache Geode 1.x, which is based on Micrometer 1.x. - * - * @author John Blum - * @see io.micrometer.binder.jvm.JvmGcMetrics - * @since 2.0.0 - */ -@SuppressWarnings("unused") -public class JvmGcMetrics extends io.micrometer.binder.jvm.JvmGcMetrics { - - /** - * @inheritDoc - */ - public JvmGcMetrics() { } - - /** - * @inheritDoc - */ - public JvmGcMetrics(Iterable tags) { - super(tags); - } -} diff --git a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmMemoryMetrics.java b/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmMemoryMetrics.java deleted file mode 100644 index ed8f07df..00000000 --- a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmMemoryMetrics.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2017-present the original author or authors. - * - * Licensed 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 - * - * https://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 io.micrometer.core.instrument.binder.jvm; - -import io.micrometer.core.instrument.Tag; - -/** - * Extension of {@link io.micrometer.binder.jvm.JvmMemoryMetrics} for adapting and repackaging purposes - * as required by Apache Geode 1.x, which is based on Micrometer 1.x. - * - * @author John Blum - * @see io.micrometer.binder.jvm.JvmMemoryMetrics - * @since 2.0.0 - */ -@SuppressWarnings("unused") -public class JvmMemoryMetrics extends io.micrometer.binder.jvm.JvmMemoryMetrics { - - /** - * @inheritDoc - */ - public JvmMemoryMetrics() { } - - /** - * @inheritDoc - */ - public JvmMemoryMetrics(Iterable tags) { - super(tags); - } -} diff --git a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmThreadMetrics.java b/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmThreadMetrics.java deleted file mode 100644 index c6f0a6c2..00000000 --- a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmThreadMetrics.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2017-present the original author or authors. - * - * Licensed 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 - * - * https://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 io.micrometer.core.instrument.binder.jvm; - -import io.micrometer.core.instrument.Tag; - -/** - * Extension of {@link io.micrometer.binder.jvm.JvmThreadMetrics} for adapting and repackaging purposes - * as required by Apache Geode 1.x, which is based on Micrometer 1.x. - * - * @author John Blum - * @see io.micrometer.binder.jvm.JvmThreadMetrics - * @since 2.0.0 - */ -@SuppressWarnings("unused") -public class JvmThreadMetrics extends io.micrometer.binder.jvm.JvmThreadMetrics { - - /** - * @inheritDoc - */ - public JvmThreadMetrics() { } - - /** - * @inheritDoc - */ - public JvmThreadMetrics(Iterable tags) { - super(tags); - } -} diff --git a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/FileDescriptorMetrics.java b/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/FileDescriptorMetrics.java deleted file mode 100644 index f658db9d..00000000 --- a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/FileDescriptorMetrics.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2017-present the original author or authors. - * - * Licensed 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 - * - * https://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 io.micrometer.core.instrument.binder.system; - -import io.micrometer.core.instrument.Tag; - -/** - * Extension of {@link io.micrometer.binder.system.FileDescriptorMetrics} for adapting and repackaging purposes - * as required by Apache Geode 1.x, which is based on Micrometer 1.x. - * - * @author John Blum - * @see io.micrometer.binder.system.FileDescriptorMetrics - * @since 2.0.0 - */ -@SuppressWarnings("unused") -public class FileDescriptorMetrics extends io.micrometer.binder.system.FileDescriptorMetrics { - - /** - * @inheritDoc - */ - public FileDescriptorMetrics() { } - - /** - * @inheritDoc - */ - public FileDescriptorMetrics(Iterable tags) { - super(tags); - } -} diff --git a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/ProcessorMetrics.java b/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/ProcessorMetrics.java deleted file mode 100644 index 15b9b1a7..00000000 --- a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/ProcessorMetrics.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2017-present the original author or authors. - * - * Licensed 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 - * - * https://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 io.micrometer.core.instrument.binder.system; - -import io.micrometer.core.instrument.Tag; - -/** - * Extension of {@link io.micrometer.binder.system.FileDescriptorMetrics} for adapting and repackaging purposes - * as required by Apache Geode 1.x, which is based on Micrometer 1.x. - * - * @author John Blum - * @see io.micrometer.binder.system.ProcessorMetrics - * @since 2.0.0 - */ -@SuppressWarnings("unused") -public class ProcessorMetrics extends io.micrometer.binder.system.ProcessorMetrics { - - /** - * @inheritDoc - */ - public ProcessorMetrics() { } - - /** - * @inheritDoc - */ - public ProcessorMetrics(Iterable tags) { - super(tags); - } -} diff --git a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/UptimeMetrics.java b/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/UptimeMetrics.java deleted file mode 100644 index 74559e1b..00000000 --- a/spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/UptimeMetrics.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2017-present the original author or authors. - * - * Licensed 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 - * - * https://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 io.micrometer.core.instrument.binder.system; - -import io.micrometer.core.instrument.Tag; - -/** - * Extension of {@link io.micrometer.binder.system.UptimeMetrics} for adapting and repackaging purposes - * as required by Apache Geode 1.x, which is based on Micrometer 1.x. - * - * @author John Blum - * @see io.micrometer.binder.system.UptimeMetrics - * @since 2.0.0 - */ -@SuppressWarnings("unused") -public class UptimeMetrics extends io.micrometer.binder.system.UptimeMetrics { - - /** - * @inheritDoc - */ - public UptimeMetrics() { } - - /** - * @inheritDoc - */ - public UptimeMetrics(Iterable tags) { - super(tags); - } -} diff --git a/spring-geode-project/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle b/spring-geode-project/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle index 998abe45..4e71d00c 100644 --- a/spring-geode-project/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle +++ b/spring-geode-project/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle @@ -13,6 +13,4 @@ dependencies { // defined in the DependencySetPlugin. testImplementation "org.springframework.boot:spring-boot-starter-test" - testRuntimeOnly project(':apache-geode-micrometer2') - } diff --git a/spring-geode-project/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-project/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle index b6cd6620..77bdee66 100644 --- a/spring-geode-project/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle +++ b/spring-geode-project/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle @@ -28,8 +28,6 @@ dependencies { testCompileOnly "com.google.code.findbugs:jsr305:$findbugsVersion" - testRuntimeOnly project(':apache-geode-micrometer2') - testRuntimeOnly "javax.cache:cache-api" testRuntimeOnly "org.apache.geode:geode-http-service:$apacheGeodeVersion" testRuntimeOnly "org.apache.geode:geode-web:$apacheGeodeVersion" diff --git a/spring-geode-project/spring-geode-starters/spring-geode-starter/spring-geode-starter.gradle b/spring-geode-project/spring-geode-starters/spring-geode-starter/spring-geode-starter.gradle index 0cff60fe..abf99804 100644 --- a/spring-geode-project/spring-geode-starters/spring-geode-starter/spring-geode-starter.gradle +++ b/spring-geode-project/spring-geode-starters/spring-geode-starter/spring-geode-starter.gradle @@ -9,8 +9,6 @@ dependencies { api project(':spring-geode') api project(':spring-geode-autoconfigure') - runtimeOnly project(':apache-geode-micrometer2') - runtimeOnly 'org.springframework.shell:spring-shell' } diff --git a/spring-geode-project/spring-geode/spring-geode.gradle b/spring-geode-project/spring-geode/spring-geode.gradle index d7bb79fc..3b6ff0c5 100644 --- a/spring-geode-project/spring-geode/spring-geode.gradle +++ b/spring-geode-project/spring-geode/spring-geode.gradle @@ -33,8 +33,6 @@ dependencies { testImplementation "org.springframework.data:spring-data-geode-test" testImplementation "org.testcontainers:testcontainers" - testRuntimeOnly project(':apache-geode-micrometer2') - testRuntimeOnly "org.hsqldb:hsqldb" }