You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/05/24 16:03:39 UTC
[camel] branch master updated: CAMEL-15043: Fixed
camel-archetype-dataformat
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 235f9c9 CAMEL-15043: Fixed camel-archetype-dataformat
235f9c9 is described below
commit 235f9c9721a46e457657a03024ca940151904ccb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun May 24 18:03:21 2020 +0200
CAMEL-15043: Fixed camel-archetype-dataformat
---
.../META-INF/maven/archetype-metadata.xml | 3 ---
.../src/main/java/__name__DataFormat.java | 5 +----
.../services/org/apache/camel/dataformat/__scheme__ | 17 -----------------
3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index ebc42a0..a08c171 100644
--- a/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -35,9 +35,6 @@
<requiredProperty key="maven-resources-plugin-version">
<defaultValue>${maven-resources-plugin-version}</defaultValue>
</requiredProperty>
- <requiredProperty key="camel-bundle-plugin-version">
- <defaultValue>${camel-bundle-plugin-version}</defaultValue>
- </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
diff --git a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java
index c0ed590..d98a41b 100644
--- a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java
+++ b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java
@@ -24,10 +24,7 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatName;
import org.apache.camel.support.service.ServiceSupport;
-/**
- * A <a href="http://camel.apache.org/data-format.html">data format</a> ({@link DataFormat})
- * for ${name} data.
- */
+@org.apache.camel.spi.annotations.Dataformat("${scheme}")
public class ${name}DataFormat extends ServiceSupport implements DataFormat, DataFormatName {
public String getDataFormatName() {
diff --git a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/dataformat/__scheme__ b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/dataformat/__scheme__
deleted file mode 100644
index f85875c..0000000
--- a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/dataformat/__scheme__
+++ /dev/null
@@ -1,17 +0,0 @@
-## ------------------------------------------------------------------------
-## 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.
-## ------------------------------------------------------------------------
-class=${package}.${name}DataFormat