You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/03/19 10:27:55 UTC

[camel] 02/03: CAMEL-13336: update license header configuration

This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 13239ad25be2fa586d19b9e0b6d9c8e868f32852
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Mar 18 17:12:02 2019 +0100

    CAMEL-13336: update license header configuration
---
 buildingtools/pom.xml                            | 2 +-
 buildingtools/src/main/resources/header-java.txt | 2 +-
 pom.xml                                          | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 1c51549..907e425 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -75,7 +75,7 @@
                                 <include>**/header-xml.txt</include>
                             </includes>
                             <mapping>
-                                <header-java.txt>JAVADOC_STYLE</header-java.txt>
+                                <header-java.txt>SLASHSTAR_STYLE</header-java.txt>
                                 <header-properties.txt>CAMEL_PROPERTIES_STYLE</header-properties.txt>
                                 <header-xml.txt>XML_STYLE</header-xml.txt>
                             </mapping>
diff --git a/buildingtools/src/main/resources/header-java.txt b/buildingtools/src/main/resources/header-java.txt
index 366cda7..ae6f28c 100644
--- a/buildingtools/src/main/resources/header-java.txt
+++ b/buildingtools/src/main/resources/header-java.txt
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/pom.xml b/pom.xml
index ff881b1..8b6ed74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -774,8 +774,11 @@
                                 <exclude>**/cacerts</exclude>
                                 <exclude>**/*.p12</exclude>
                                 <exclude>**/*.txt</exclude>
+                                <exclude>.mvn/**</exclude>
+                                <exclude>mvnw*</exclude>
                             </excludes>
                             <mapping>
+                                <java>SLASHSTAR_STYLE</java>
                                 <properties>CAMEL_PROPERTIES_STYLE</properties>
                                 <spring.factories>CAMEL_PROPERTIES_STYLE</spring.factories>
                                 <spring.provides>CAMEL_PROPERTIES_STYLE</spring.provides>