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
The following commit(s) were added to refs/heads/master by this push: new fb71df3 Fixed RAT license check fb71df3 is described below commit fb71df3b85fcbfbb09872d54946667fc3e05c4d9 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sat Aug 29 14:05:26 2020 +0200 Fixed RAT license check --- .../services/org/apache/camel/component/minio | 1 - components/camel-oaipmh/pom.xml | 25 +++++++++++++++++++++- .../org/apache/camel/oaipmh/component/oaipmh.json | 2 +- .../camel/oaipmh/component/OAIPMHEndpoint.java | 2 +- .../services/org/apache/camel/component/oaipmh | 1 - .../src/generated/resources/metadata.json | 2 +- pom.xml | 3 +++ 7 files changed, 30 insertions(+), 6 deletions(-) diff --git a/components/camel-minio/src/main/resources/META-INF/services/org/apache/camel/component/minio b/components/camel-minio/src/main/resources/META-INF/services/org/apache/camel/component/minio deleted file mode 100644 index 6a731ab..0000000 --- a/components/camel-minio/src/main/resources/META-INF/services/org/apache/camel/component/minio +++ /dev/null @@ -1 +0,0 @@ -class=org.apache.camel.component.minio.MinioComponent diff --git a/components/camel-oaipmh/pom.xml b/components/camel-oaipmh/pom.xml index 8e5d9ea..2e92fc5 100644 --- a/components/camel-oaipmh/pom.xml +++ b/components/camel-oaipmh/pom.xml @@ -1,5 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<!-- + + 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"> <modelVersion>4.0.0</modelVersion> @@ -57,6 +75,11 @@ <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/components/camel-oaipmh/src/generated/resources/org/apache/camel/oaipmh/component/oaipmh.json b/components/camel-oaipmh/src/generated/resources/org/apache/camel/oaipmh/component/oaipmh.json index b70714c..5e31694 100644 --- a/components/camel-oaipmh/src/generated/resources/org/apache/camel/oaipmh/component/oaipmh.json +++ b/components/camel-oaipmh/src/generated/resources/org/apache/camel/oaipmh/component/oaipmh.json @@ -18,7 +18,7 @@ "async": false, "consumerOnly": false, "producerOnly": false, - "lenientProperties": false + "lenientProperties": true }, "componentProperties": { "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...] diff --git a/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java b/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java index 3f30b69..b8bc309 100644 --- a/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java +++ b/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java @@ -35,7 +35,7 @@ import org.joda.time.format.ISODateTimeFormat; /** * Harvest metadata using OAI-PMH protocol */ -@UriEndpoint(firstVersion = "3.5.0", scheme = "oaipmh", title = "OAI-PMH", syntax = "oaipmh:baseUrl", +@UriEndpoint(firstVersion = "3.5.0", scheme = "oaipmh", title = "OAI-PMH", syntax = "oaipmh:baseUrl", lenientProperties = true, category = { Category.ENDPOINT, Category.WEBSERVICE, Category.BATCH }) public class OAIPMHEndpoint extends DefaultPollingEndpoint { diff --git a/components/camel-oaipmh/src/main/resources/META-INF/services/org/apache/camel/component/oaipmh b/components/camel-oaipmh/src/main/resources/META-INF/services/org/apache/camel/component/oaipmh deleted file mode 100644 index fb0c2b1..0000000 --- a/components/camel-oaipmh/src/main/resources/META-INF/services/org/apache/camel/component/oaipmh +++ /dev/null @@ -1 +0,0 @@ -class=org.apache.camel.OAIPMHComponent diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json index 4dcaf80..1dd0e36 100644 --- a/core/camel-componentdsl/src/generated/resources/metadata.json +++ b/core/camel-componentdsl/src/generated/resources/metadata.json @@ -5232,7 +5232,7 @@ "async": false, "consumerOnly": false, "producerOnly": false, - "lenientProperties": false + "lenientProperties": true }, "Olingo2ComponentBuilderFactory": { "kind": "component", diff --git a/pom.xml b/pom.xml index 24dae85..cca6e23 100644 --- a/pom.xml +++ b/pom.xml @@ -271,6 +271,7 @@ <exclude>**/dataformat-options.mvel</exclude> <exclude>**/eip-options.mvel</exclude> <exclude>**/language-options.mvel</exclude> + <exclude>**/main-options.mvel</exclude> <exclude>**/website-components-list.mvel</exclude> <exclude>**/website-languages-list.mvel</exclude> <exclude>**/website-others-list.mvel</exclude> @@ -327,6 +328,8 @@ <exclude>**/META-INF/MANIFEST.MF</exclude> <exclude>**/openapi.yaml</exclude> <exclude>**/ignite/work/**/*</exclude> + <exclude>**/MySecondFooConfigurer.java</exclude> + <exclude>**/MySecondBarConfigurer.java</exclude> <!-- Maven Wrapper --> <exclude>.mvn/**/*</exclude> </excludes>