This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 07b98ce Upgrade iota and polished 07b98ce is described below commit 07b98ceb6f3aaa5586b03dda76dda8135feacf43 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Jun 21 16:21:53 2021 +0200 Upgrade iota and polished --- .../org/apache/camel/catalog/docs/iota-component.adoc | 2 +- components/camel-iota/pom.xml | 15 ++++++++++----- .../resources/org/apache/camel/component/iota/iota.json | 2 +- components/camel-iota/src/main/docs/iota-component.adoc | 2 +- .../org/apache/camel/component/iota/IOTAEndpoint.java | 3 +-- .../builder/endpoint/dsl/IOTAEndpointBuilderFactory.java | 6 ++++-- docs/components/modules/ROOT/pages/iota-component.adoc | 2 +- parent/pom.xml | 2 +- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/iota-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/iota-component.adoc index c76ddfb..932ffc5 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/iota-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/iota-component.adoc @@ -73,7 +73,7 @@ with the following path and query parameters: | *operation* (producer) | *Required* Which operation to perform, one of: sendTransfer, getNewAddress, getTransfers. There are 3 enums and the value can be one of: sendTransfer, getNewAddress, getTransfers | | String | *tag* (producer) | TAG | | String | *url* (producer) | *Required* Node url | | String -| *securityLevel* (security) | Address security level | 1 | Integer +| *securityLevel* (security) | Security level to be used for the private key / address. Can be 1, 2 or 3. | 1 | Integer |=== // endpoint options: END diff --git a/components/camel-iota/pom.xml b/components/camel-iota/pom.xml index 07ba6ed..8f529c9 100644 --- a/components/camel-iota/pom.xml +++ b/components/camel-iota/pom.xml @@ -17,7 +17,8 @@ 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> @@ -47,10 +48,14 @@ <artifactId>jota</artifactId> <version>${jota-version}</version> <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>*</artifactId> - </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.iota</groupId> + <artifactId>java-md-doclet</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/components/camel-iota/src/generated/resources/org/apache/camel/component/iota/iota.json b/components/camel-iota/src/generated/resources/org/apache/camel/component/iota/iota.json index 279eef6..e7a71a2 100644 --- a/components/camel-iota/src/generated/resources/org/apache/camel/component/iota/iota.json +++ b/components/camel-iota/src/generated/resources/org/apache/camel/component/iota/iota.json @@ -33,6 +33,6 @@ "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "sendTransfer", "getNewAddress", "getTransfers" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Which operation to perform, one of: sendTransfer, getNewAddress, getTransfers" }, "tag": { "kind": "parameter", "displayName": "Tag", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "TAG" }, "url": { "kind": "parameter", "displayName": "Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Node url" }, - "securityLevel": { "kind": "parameter", "displayName": "Security Level", "group": "security", "label": "security", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "Address security level" } + "securityLevel": { "kind": "parameter", "displayName": "Security Level", "group": "security", "label": "security", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "Security level to be used for the private key \/ address. Can be 1, 2 or 3." } } } diff --git a/components/camel-iota/src/main/docs/iota-component.adoc b/components/camel-iota/src/main/docs/iota-component.adoc index c76ddfb..932ffc5 100644 --- a/components/camel-iota/src/main/docs/iota-component.adoc +++ b/components/camel-iota/src/main/docs/iota-component.adoc @@ -73,7 +73,7 @@ with the following path and query parameters: | *operation* (producer) | *Required* Which operation to perform, one of: sendTransfer, getNewAddress, getTransfers. There are 3 enums and the value can be one of: sendTransfer, getNewAddress, getTransfers | | String | *tag* (producer) | TAG | | String | *url* (producer) | *Required* Node url | | String -| *securityLevel* (security) | Address security level | 1 | Integer +| *securityLevel* (security) | Security level to be used for the private key / address. Can be 1, 2 or 3. | 1 | Integer |=== // endpoint options: END diff --git a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java index 06196f7..8e8140b 100644 --- a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java +++ b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java @@ -126,7 +126,7 @@ public class IOTAEndpoint extends DefaultEndpoint { } /** - * Address security level + * Security level to be used for the private key / address. Can be 1, 2 or 3. */ public void setSecurityLevel(Integer securityLevel) { this.securityLevel = securityLevel; @@ -140,7 +140,6 @@ public class IOTAEndpoint extends DefaultEndpoint { * The minWeightMagnitude is the minimum number of zeroes that a proof-of-work output/transaction hash must end with * to be considered valid by full nodes */ - public void setMinWeightMagnitude(Integer minWeightMagnitude) { this.minWeightMagnitude = minWeightMagnitude; } diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java index f7f9869..5e0be9e 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java @@ -196,7 +196,8 @@ public interface IOTAEndpointBuilderFactory { return this; } /** - * Address security level. + * Security level to be used for the private key / address. Can be 1, 2 + * or 3. * * The option is a: <code>java.lang.Integer</code> type. * @@ -211,7 +212,8 @@ public interface IOTAEndpointBuilderFactory { return this; } /** - * Address security level. + * Security level to be used for the private key / address. Can be 1, 2 + * or 3. * * The option will be converted to a * <code>java.lang.Integer</code> type. diff --git a/docs/components/modules/ROOT/pages/iota-component.adoc b/docs/components/modules/ROOT/pages/iota-component.adoc index f2e1175..95ce853 100644 --- a/docs/components/modules/ROOT/pages/iota-component.adoc +++ b/docs/components/modules/ROOT/pages/iota-component.adoc @@ -75,7 +75,7 @@ with the following path and query parameters: | *operation* (producer) | *Required* Which operation to perform, one of: sendTransfer, getNewAddress, getTransfers. There are 3 enums and the value can be one of: sendTransfer, getNewAddress, getTransfers | | String | *tag* (producer) | TAG | | String | *url* (producer) | *Required* Node url | | String -| *securityLevel* (security) | Address security level | 1 | Integer +| *securityLevel* (security) | Security level to be used for the private key / address. Can be 1, 2 or 3. | 1 | Integer |=== // endpoint options: END diff --git a/parent/pom.xml b/parent/pom.xml index d1b9b2c..2b5ff7b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -314,7 +314,7 @@ <libthrift-version>0.12.0</libthrift-version> <jing-version>20030619</jing-version> <jodatime2-version>2.10.10</jodatime2-version> - <jota-version>1.0.0-beta7</jota-version> + <jota-version>1.0.0-beta9</jota-version> <jolokia-version>1.6.2</jolokia-version> <jolt-version>0.1.1</jolt-version> <jool-version>0.9.12</jool-version>