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/07 08:01:46 UTC

[camel] branch master updated (18ed34a -> d9be3a4)

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

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


    from 18ed34a  Sync Properties
     new 0307e36  Fixed license
     new 243e7e6  Fixed license
     new d9be3a4  Add license header to generated camel-dependencies pom

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 components/camel-djl/pom.xml                          | 19 +++++++++++++++++--
 .../META-INF/services/org/apache/camel/component/djl  |  1 -
 .../robotframework/RobotFrameworkCamelUtilsTest.java  |  3 ++-
 .../robotframework/RobotFrameworkComponentTest.java   |  5 +++++
 ...el.component.undertow.spi.UndertowSecurityProvider | 17 +++++++++++++++++
 .../resources/header-xml.txt => etc/apache-header.xml |  2 +-
 pom.xml                                               |  1 +
 .../maven/sync/properties/SyncPropertiesMojo.java     | 19 +++++++++++++++++++
 8 files changed, 62 insertions(+), 5 deletions(-)
 delete mode 100644 components/camel-djl/src/main/resources/META-INF/services/org/apache/camel/component/djl
 copy buildingtools/src/main/resources/header-xml.txt => etc/apache-header.xml (99%)


[camel] 03/03: Add license header to generated camel-dependencies pom

Posted by da...@apache.org.
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

commit d9be3a4118fa74ea01a011e6005160b8bf0fb62b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 7 09:59:36 2020 +0200

    Add license header to generated camel-dependencies pom
---
 etc/apache-header.xml                                 | 18 ++++++++++++++++++
 .../maven/sync/properties/SyncPropertiesMojo.java     | 19 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/etc/apache-header.xml b/etc/apache-header.xml
new file mode 100644
index 0000000..913a5ff
--- /dev/null
+++ b/etc/apache-header.xml
@@ -0,0 +1,18 @@
+<!--
+
+    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.
+
+-->
\ No newline at end of file
diff --git a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
index 54f8e4b..d199a03 100644
--- a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
+++ b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
@@ -17,11 +17,14 @@
 package org.apache.camel.maven.sync.properties;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.nio.file.Files;
 import java.util.Properties;
 import java.util.TreeMap;
 
+import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.OrderedProperties;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -52,6 +55,12 @@ public class SyncPropertiesMojo extends AbstractMojo {
     @Parameter(defaultValue = "${basedir}/../../../camel-dependencies/pom.xml")
     protected File targetPom;
 
+    /**
+     * The license header file.
+     */
+    @Parameter(defaultValue = "${basedir}/../../etc/apache-header.xml")
+    protected File licenceHeader;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         try {
@@ -77,6 +86,16 @@ public class SyncPropertiesMojo extends AbstractMojo {
                 MavenXpp3Writer mavenWriter = new MavenXpp3Writer();
                 mavenWriter.write(new FileWriter(targetPom), model);
             }
+
+            // add license header in top
+            String text = IOHelper.loadText(new FileInputStream(targetPom));
+            String text2 = IOHelper.loadText(new FileInputStream(licenceHeader));
+            StringBuffer sb = new StringBuffer(text);
+            int pos = sb.indexOf("<project");
+            sb.insert(pos, text2);
+
+            // write lines
+            Files.writeString(targetPom.toPath(), sb.toString());
         } catch (Exception ex) {
             throw new MojoExecutionException("Cannot copy the properties between POMs", ex);
         }


[camel] 02/03: Fixed license

Posted by da...@apache.org.
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

commit 243e7e61c4ffaa8fff36cc479403d40e07c77bff
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 7 09:32:58 2020 +0200

    Fixed license
---
 .../robotframework/RobotFrameworkCamelUtilsTest.java    |  3 ++-
 .../robotframework/RobotFrameworkComponentTest.java     |  5 +++++
 ...amel.component.undertow.spi.UndertowSecurityProvider | 17 +++++++++++++++++
 pom.xml                                                 |  1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelUtilsTest.java b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelUtilsTest.java
index 4fe9baa..7862bc3 100644
--- a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelUtilsTest.java
+++ b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelUtilsTest.java
@@ -117,7 +117,8 @@ public class RobotFrameworkCamelUtilsTest extends CamelTestSupport {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
-                from("direct:setVariableCamelExchange").to("robotframework:src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_exchange.robot?xunitFile=target/out.xml")
+                from("direct:setVariableCamelExchange")
+                    .to("robotframework:src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_exchange.robot?xunitFile=target/out.xml&outputDirectory=target")
                     .to("mock:result");
             }
         };
diff --git a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkComponentTest.java b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkComponentTest.java
index e9de573..f6f03b0 100644
--- a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkComponentTest.java
+++ b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkComponentTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.robotframework;
 
+import java.io.File;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -111,6 +113,9 @@ public class RobotFrameworkComponentTest extends CamelTestSupport {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
+                RobotFrameworkComponent rf = context.getComponent("robotframework", RobotFrameworkComponent.class);
+                rf.getConfiguration().setOutputDirectory(new File("target"));
+
                 from("direct:setVariableCamelBody").to("robotframework:src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_body.robot?xunitFile=target/out.xml")
                     .to("mock:result");
 
diff --git a/components/camel-undertow-spring-security/src/main/resources/META-INF/services/org.apache.camel.component.undertow.spi.UndertowSecurityProvider b/components/camel-undertow-spring-security/src/main/resources/META-INF/services/org.apache.camel.component.undertow.spi.UndertowSecurityProvider
index d185902..8232782 100644
--- a/components/camel-undertow-spring-security/src/main/resources/META-INF/services/org.apache.camel.component.undertow.spi.UndertowSecurityProvider
+++ b/components/camel-undertow-spring-security/src/main/resources/META-INF/services/org.apache.camel.component.undertow.spi.UndertowSecurityProvider
@@ -1 +1,18 @@
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
 org.apache.camel.component.spring.security.SpringSecurityProvider
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dbc3382..9fd3c62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,7 @@
                                 **/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension
                             </exclude>
                             <exclude>**/META-INF/MANIFEST.MF</exclude>
+                            <exclude>**/openapi.yaml</exclude>
                             <!-- Maven Wrapper -->
                             <exclude>.mvn/**/*</exclude>
                         </excludes>


[camel] 01/03: Fixed license

Posted by da...@apache.org.
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

commit 0307e36bcb95595f1c4803dceaad7bbf2d631e60
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 7 09:26:36 2020 +0200

    Fixed license
---
 components/camel-djl/pom.xml                          | 19 +++++++++++++++++--
 .../META-INF/services/org/apache/camel/component/djl  |  1 -
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/components/camel-djl/pom.xml b/components/camel-djl/pom.xml
index 27ddb4d..2862eeb 100644
--- a/components/camel-djl/pom.xml
+++ b/components/camel-djl/pom.xml
@@ -1,7 +1,22 @@
 <?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>
 
     <parent>
diff --git a/components/camel-djl/src/main/resources/META-INF/services/org/apache/camel/component/djl b/components/camel-djl/src/main/resources/META-INF/services/org/apache/camel/component/djl
deleted file mode 100644
index 0694061..0000000
--- a/components/camel-djl/src/main/resources/META-INF/services/org/apache/camel/component/djl
+++ /dev/null
@@ -1 +0,0 @@
-class=org.apache.camel.component.djl.DJLComponent