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 2016/08/29 07:13:33 UTC

camel git commit: License header check fix

Repository: camel
Updated Branches:
  refs/heads/master 61048572a -> d1af05a2f


License header check fix


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1af05a2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1af05a2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1af05a2

Branch: refs/heads/master
Commit: d1af05a2ff9c14f7ef6705cb8f82dc6b8272bff9
Parents: 6104857
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 29 09:13:11 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 29 09:13:27 2016 +0200

----------------------------------------------------------------------
 pom.xml                                          |  8 ++++++++
 .../util/LibraryVersionMismatchChecker.java      | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d1af05a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 495b8b7..3cfc51c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -239,6 +239,14 @@
                 <exclude>**/component-header.mvel</exclude>
                 <exclude>**/component-options.mvel</exclude>
                 <exclude>**/endpoint-options.mvel</exclude>
+                <exclude>**/dataformat-options.mvel</exclude>
+                <exclude>**/language-options.mvel</exclude>
+                <exclude>**/readme-components.mvel</exclude>
+                <exclude>**/readme-components.mvel</exclude>
+                <exclude>**/readme-dataformats.mvel</exclude>
+                <exclude>**/readme-eips.mvel</exclude>
+                <exclude>**/readme-languages.mvel</exclude>
+                <exclude>**/spring-boot-starter-NOTICE.txt</exclude>
                 <!-- cxf does not handle comments here -->
                 <exclude>**/src/main/resources/META-INF/cxf/cxf.extension</exclude>
                 <exclude>**/src/main/resources/META-INF/cxf/bus-extensions.txt</exclude>

http://git-wip-us.apache.org/repos/asf/camel/blob/d1af05a2/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java
index c6924f2..7f97fd1 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
 package org.apache.camel.itest.springboot.util;
 
 import java.io.File;
@@ -11,13 +27,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.apache.camel.itest.springboot.util.ArquillianPackager;
-import org.apache.camel.itest.springboot.util.DependencyResolver;
 import org.apache.commons.io.IOUtils;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem;
-import org.junit.Assert;
 import org.junit.Test;
 
 /**