This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aa0050e42aa857b66ecdfeeedf7008bb35664fe6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Feb 17 20:32:28 2020 +0100
Upgrade microprofile specs
---
components/camel-microprofile-config/pom.xml | 2 +-
components/camel-microprofile-health/pom.xml | 15 +++++++--------
components/camel-microprofile-metrics/pom.xml | 2 +-
.../microprofile/metrics/microprofile-metrics.json | 2 +-
.../src/main/docs/microprofile-metrics-component.adoc | 2 +-
parent/pom.xml | 12 ++++++------
6 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/components/camel-microprofile-config/pom.xml
b/components/camel-microprofile-config/pom.xml
index 4bb6dd5..c05ecb1 100644
--- a/components/camel-microprofile-config/pom.xml
+++ b/components/camel-microprofile-config/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
+ <groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
<version>${smallrye-config-version}</version>
<scope>test</scope>
diff --git a/components/camel-microprofile-health/pom.xml
b/components/camel-microprofile-health/pom.xml
index edc9ccb..627a780 100644
--- a/components/camel-microprofile-health/pom.xml
+++ b/components/camel-microprofile-health/pom.xml
@@ -51,6 +51,12 @@
<version>${microprofile-health-version}</version>
<scope>provided</scope>
</dependency>
+ <!-- smallrye health uses cdi api -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${cdi-api-2.0-version}</version>
+ </dependency>
<!-- testing -->
<dependency>
@@ -66,18 +72,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
+ <groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
<version>${smallrye-config-version}</version>
<scope>test</scope>
</dependency>
- <!-- smallrye health uses cdi api -->
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
- <scope>test</scope>
- </dependency>
<!-- JSON support for smallrye-health -->
<dependency>
diff --git a/components/camel-microprofile-metrics/pom.xml
b/components/camel-microprofile-metrics/pom.xml
index afdaf57..b824900 100644
--- a/components/camel-microprofile-metrics/pom.xml
+++ b/components/camel-microprofile-metrics/pom.xml
@@ -60,7 +60,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.smallrye</groupId>
+ <groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
<version>${smallrye-config-version}</version>
<scope>test</scope>
diff --git
a/components/camel-microprofile-metrics/src/generated/resources/org/apache/camel/component/microprofile/metrics/microprofile-metrics.json
b/components/camel-microprofile-metrics/src/generated/resources/org/apache/camel/component/microprofile/metrics/microprofile-metrics.json
index a55a023..94e96dc 100644
---
a/components/camel-microprofile-metrics/src/generated/resources/org/apache/camel/component/microprofile/metrics/microprofile-metrics.json
+++
b/components/camel-microprofile-metrics/src/generated/resources/org/apache/camel/component/microprofile/metrics/microprofile-metrics.json
@@ -24,7 +24,7 @@
"metricRegistry": { "kind": "property", "displayName": "Metric Registry",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.eclipse.microprofile.metrics.MetricRegistry", "deprecated":
false, "secret": false, "description": "Use a custom MetricRegistry." }
},
"properties": {
- "metricType": { "kind": "path", "displayName": "Metric Type", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.eclipse.microprofile.metrics.MetricType", "enum": [ "concurrent gauge",
"counter", "gauge", "meter", "histogram", "timer", "invalid" ], "deprecated":
false, "deprecationNote": "", "secret": false, "description": "Metric type" },
+ "metricType": { "kind": "path", "displayName": "Metric Type", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.eclipse.microprofile.metrics.MetricType", "enum": [ "concurrent gauge",
"counter", "gauge", "meter", "histogram", "timer", "simple timer", "invalid" ],
"deprecated": false, "deprecationNote": "", "secret": false, "description":
"Metric type" },
"metricName": { "kind": "path", "displayName": "Metric Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "Metric name" },
"action": { "kind": "parameter", "displayName": "Action", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"Action to use when using the timer type" },
"counterIncrement": { "kind": "parameter", "displayName": "Counter
Increment", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false,
"description": "Increment value when using the counter type" },
diff --git
a/components/camel-microprofile-metrics/src/main/docs/microprofile-metrics-component.adoc
b/components/camel-microprofile-metrics/src/main/docs/microprofile-metrics-component.adoc
index 0b0ed8e..17cd42f 100644
---
a/components/camel-microprofile-metrics/src/main/docs/microprofile-metrics-component.adoc
+++
b/components/camel-microprofile-metrics/src/main/docs/microprofile-metrics-component.adoc
@@ -61,7 +61,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *metricType* | *Required* Metric type. The value can be one of: concurrent
gauge, counter, gauge, meter, histogram, timer, invalid | | MetricType
+| *metricType* | *Required* Metric type. The value can be one of: concurrent
gauge, counter, gauge, meter, histogram, timer, simple timer, invalid | |
MetricType
| *metricName* | *Required* Metric name | | String
|===
diff --git a/parent/pom.xml b/parent/pom.xml
index 530bc04..e5dbb59 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -457,9 +457,9 @@
<maven-war-plugin-version>3.2.3</maven-war-plugin-version>
<metrics-version>3.2.6</metrics-version>
<micrometer-version>1.2.2</micrometer-version>
- <microprofile-config-version>1.3</microprofile-config-version>
- <microprofile-metrics-version>2.2.1</microprofile-metrics-version>
- <microprofile-health-version>2.1</microprofile-health-version>
+ <microprofile-config-version>1.4</microprofile-config-version>
+ <microprofile-metrics-version>2.3</microprofile-metrics-version>
+ <microprofile-health-version>2.2</microprofile-health-version>
<milo-version>0.3.7</milo-version>
<milo-guava-version>26.0-jre</milo-guava-version>
<mimepull-version>1.9.12</mimepull-version>
@@ -575,9 +575,9 @@
<slf4j-api-version>1.7.30</slf4j-api-version>
<slf4j-version>1.7.30</slf4j-version>
<smack-version>4.3.4</smack-version>
- <smallrye-config-version>1.5.0</smallrye-config-version>
- <smallrye-metrics-version>2.3.2</smallrye-metrics-version>
- <smallrye-health-version>2.1.0</smallrye-health-version>
+ <smallrye-config-version>1.6.1</smallrye-config-version>
+ <smallrye-metrics-version>2.4.0</smallrye-metrics-version>
+ <smallrye-health-version>2.2.0</smallrye-health-version>
<snakeyaml-version>1.25</snakeyaml-version>
<snappy-version>1.1.4</snappy-version>
<snmp4j-version>2.6.3_1</snmp4j-version>
