This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 01581787605eab637ea678c209e9e0a89fadb59e Author: Roberto Flores <[email protected]> AuthorDate: Fri Aug 16 17:07:22 2019 -0500 Rebuild project. --- .../camel-any23/src/main/docs/any23-dataformat.adoc | 13 +++++++------ components/readme.adoc | 2 +- .../endpoint/dsl/DataSetEndpointBuilderFactory.java | 2 +- docs/components/modules/ROOT/pages/any23-dataformat.adoc | 13 +++++++------ .../components-starter/camel-any23-starter/pom.xml | 16 ---------------- .../any23/springboot/Any23DataFormatConfiguration.java | 10 +++++----- .../camel-spring-boot-dependencies/pom.xml | 9 +++++++-- 7 files changed, 28 insertions(+), 37 deletions(-) diff --git a/components/camel-any23/src/main/docs/any23-dataformat.adoc b/components/camel-any23/src/main/docs/any23-dataformat.adoc index 3f6450c..36d2a84 100644 --- a/components/camel-any23/src/main/docs/any23-dataformat.adoc +++ b/components/camel-any23/src/main/docs/any23-dataformat.adoc @@ -1,11 +1,12 @@ [[any23-dataformat]] -== Any23 DataFormat -Camel Any23 is a DataFormat that uses the Apache Anything To Triples (Any23) library to extract structured data in RDF from a variety of documents on the web. += Any23 DataFormat +Camel Any23 is a DataFormat that uses the Apache Anything To Triples (Any23) library to extract structured data in RDF from a variety of documents on the web. *Available as of Camel version 3.0* -The main functionality of this DataFormat focuses on its Unmarshal method which extracts RDF triplets from compatible pages, in a wide variety of RDF syntaxes. *Available as of Camel version 3.0* + +The main functionality of this DataFormat focuses on its Unmarshal method which extracts RDF triplets from compatible pages, in a wide variety of RDF syntaxes. Any23 is a Data Format that is intended to convert HTML from a site (or file) into rdf. @@ -27,7 +28,7 @@ The Any23 dataformat supports 5 options, which are listed below. |=== // dataformat options: END // spring-boot-auto-configure options: START -=== Spring Boot Auto-Configuration +== Spring Boot Auto-Configuration When using Spring Boot make sure to use the following Maven dependency to have support for auto configuration: @@ -50,7 +51,7 @@ The component supports 5 options, which are listed below. |=== | Name | Description | Default | Type | *camel.dataformat.any23.base-u-r-i* | The URI to use as base for building RDF entities if only relative paths are provided. | | String -| *camel.dataformat.any23.configurations* | Configurations for Apache Any23 as key-value pairs in order to customize the extraction process. The list of supported parameters can be found here. If not provided, a default configuration is used. The option is a java.util.Map<java.lang.String,java.lang.String> type. | | String +| *camel.dataformat.any23.configurations* | Configurations for Apache Any23 as key-value pairs in order to customize the extraction process. The list of supported parameters can be found here. If not provided, a default configuration is used. | | Map | *camel.dataformat.any23.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.any23.enabled* | Whether to enable auto configuration of the any23 data format. This is enabled by default. | | Boolean | *camel.dataformat.any23.extractors* | List of Any23 extractors to be used in the unmarshal operation. A list of the available extractors can be found here here. If not provided, all the available extractors are used. | | List @@ -115,4 +116,4 @@ the download page for the latest versions). <artifactId>camel-any23</artifactId> <version>x.x.x</version> </dependency> ----------------------------------------- +---------------------------------------- \ No newline at end of file diff --git a/components/readme.adoc b/components/readme.adoc index 5043495..1843c35 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -902,7 +902,7 @@ Number of Components: 296 in 234 JAR artifacts (0 deprecated) == Data Formats // dataformats: START -Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated) +Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java index 8adb756..f56d310 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java @@ -814,4 +814,4 @@ public interface DataSetEndpointBuilderFactory { } return new DataSetEndpointBuilderImpl(path); } -} +} \ No newline at end of file diff --git a/docs/components/modules/ROOT/pages/any23-dataformat.adoc b/docs/components/modules/ROOT/pages/any23-dataformat.adoc index 3f6450c..36d2a84 100644 --- a/docs/components/modules/ROOT/pages/any23-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/any23-dataformat.adoc @@ -1,11 +1,12 @@ [[any23-dataformat]] -== Any23 DataFormat -Camel Any23 is a DataFormat that uses the Apache Anything To Triples (Any23) library to extract structured data in RDF from a variety of documents on the web. += Any23 DataFormat +Camel Any23 is a DataFormat that uses the Apache Anything To Triples (Any23) library to extract structured data in RDF from a variety of documents on the web. *Available as of Camel version 3.0* -The main functionality of this DataFormat focuses on its Unmarshal method which extracts RDF triplets from compatible pages, in a wide variety of RDF syntaxes. *Available as of Camel version 3.0* + +The main functionality of this DataFormat focuses on its Unmarshal method which extracts RDF triplets from compatible pages, in a wide variety of RDF syntaxes. Any23 is a Data Format that is intended to convert HTML from a site (or file) into rdf. @@ -27,7 +28,7 @@ The Any23 dataformat supports 5 options, which are listed below. |=== // dataformat options: END // spring-boot-auto-configure options: START -=== Spring Boot Auto-Configuration +== Spring Boot Auto-Configuration When using Spring Boot make sure to use the following Maven dependency to have support for auto configuration: @@ -50,7 +51,7 @@ The component supports 5 options, which are listed below. |=== | Name | Description | Default | Type | *camel.dataformat.any23.base-u-r-i* | The URI to use as base for building RDF entities if only relative paths are provided. | | String -| *camel.dataformat.any23.configurations* | Configurations for Apache Any23 as key-value pairs in order to customize the extraction process. The list of supported parameters can be found here. If not provided, a default configuration is used. The option is a java.util.Map<java.lang.String,java.lang.String> type. | | String +| *camel.dataformat.any23.configurations* | Configurations for Apache Any23 as key-value pairs in order to customize the extraction process. The list of supported parameters can be found here. If not provided, a default configuration is used. | | Map | *camel.dataformat.any23.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.any23.enabled* | Whether to enable auto configuration of the any23 data format. This is enabled by default. | | Boolean | *camel.dataformat.any23.extractors* | List of Any23 extractors to be used in the unmarshal operation. A list of the available extractors can be found here here. If not provided, all the available extractors are used. | | List @@ -115,4 +116,4 @@ the download page for the latest versions). <artifactId>camel-any23</artifactId> <version>x.x.x</version> </dependency> ----------------------------------------- +---------------------------------------- \ No newline at end of file diff --git a/platforms/spring-boot/components-starter/camel-any23-starter/pom.xml b/platforms/spring-boot/components-starter/camel-any23-starter/pom.xml index 801bc39..3bb59a6 100644 --- a/platforms/spring-boot/components-starter/camel-any23-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-any23-starter/pom.xml @@ -38,22 +38,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-any23</artifactId> <version>${project.version}</version> - <!--START OF GENERATED CODE--> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java index 9086602..80a2e8d 100644 --- a/platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java @@ -17,6 +17,7 @@ package org.apache.camel.dataformat.any23.springboot; import java.util.List; +import java.util.Map; import javax.annotation.Generated; import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -40,10 +41,9 @@ public class Any23DataFormatConfiguration /** * Configurations for Apache Any23 as key-value pairs in order to customize * the extraction process. The list of supported parameters can be found - * here. If not provided, a default configuration is used. The option is a - * java.util.Map<java.lang.String,java.lang.String> type. + * here. If not provided, a default configuration is used. */ - private String configurations; + private Map<String, String> configurations; /** * List of Any23 extractors to be used in the unmarshal operation. A list of * the available extractors can be found here here. If not provided, all the @@ -63,11 +63,11 @@ public class Any23DataFormatConfiguration */ private Boolean contentTypeHeader = false; - public String getConfigurations() { + public Map<String, String> getConfigurations() { return configurations; } - public void setConfigurations(String configurations) { + public void setConfigurations(Map<String, String> configurations) { this.configurations = configurations; } diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 3f1bc85..459033c 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3767,8 +3767,13 @@ </dependency> <dependency> <groupId>org.eclipse.rdf4j</groupId> - <artifactId>rdf4j-runtime</artifactId> - <version>3.0.0-M1</version> + <artifactId>rdf4j-model</artifactId> + <version>2.4.4</version> + </dependency> + <dependency> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-api</artifactId> + <version>2.4.4</version> </dependency> <dependency> <groupId>org.hamcrest</groupId>
