You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/01/28 06:42:55 UTC

[camel] branch master updated (607842d -> 714425e)

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

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


    from 607842d  CAMEL-16001 - Final regen and full build
     new 48bebfd  CAMEL-16001 - Fixed POM indentation
     new 7d6df90  CAMEL-16001 - Use Parent pom property placeholders for versions
     new 714425e  Sync deps

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:
 camel-dependencies/pom.xml               |   1 +
 components/camel-huaweicloud-smn/pom.xml | 142 +++++++++++++++----------------
 parent/pom.xml                           |   1 +
 3 files changed, 72 insertions(+), 72 deletions(-)


[camel] 01/03: CAMEL-16001 - Fixed POM indentation

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 48bebfd2f1229c4f24787e400a6175d1feac464e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jan 28 07:36:08 2021 +0100

    CAMEL-16001 - Fixed POM indentation
---
 components/camel-huaweicloud-smn/pom.xml | 142 +++++++++++++++----------------
 1 file changed, 70 insertions(+), 72 deletions(-)

diff --git a/components/camel-huaweicloud-smn/pom.xml b/components/camel-huaweicloud-smn/pom.xml
index 551c785..13d4109 100644
--- a/components/camel-huaweicloud-smn/pom.xml
+++ b/components/camel-huaweicloud-smn/pom.xml
@@ -1,83 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    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/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/maven-v4_0_0.xsd">
 
-  <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>3.8.0-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>org.apache.camel</groupId>
+		<artifactId>components</artifactId>
+		<version>3.8.0-SNAPSHOT</version>
+	</parent>
 
-  <artifactId>camel-huaweicloud-smn</artifactId>
-  <packaging>jar</packaging>
+	<artifactId>camel-huaweicloud-smn</artifactId>
+	<packaging>jar</packaging>
 
-  <name>Camel :: Huawei Cloud SimpleNotification Component</name>
-  <description>A Camel Huawei Simple Notification Component</description>
+	<name>Camel :: Huawei Cloud SimpleNotification Component</name>
+	<description>A Camel Huawei Simple Notification Component</description>
 
-  <properties>
-  </properties>
+	<properties>
+	</properties>
 
-  <dependencies>
-    <!-- camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-support</artifactId>
-    </dependency>
+	<dependencies>
+		<!-- camel -->
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-support</artifactId>
+		</dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>2.12.0</version>
-    </dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.12.0</version>
+		</dependency>
 
-    <!-- HuaweiCloud SDK v3-->
-    <dependency>
-      <groupId>com.huaweicloud.sdk</groupId>
-      <artifactId>huaweicloud-sdk-core</artifactId>
-      <version>3.0.30-rc</version>
-    </dependency>
-    <dependency>
-      <groupId>com.huaweicloud.sdk</groupId>
-      <artifactId>huaweicloud-sdk-smn</artifactId>
-      <version>3.0.30-rc</version>
-    </dependency>
-    
-        <!-- for testing -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core-catalog</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-  </dependencies>
+		<!-- HuaweiCloud SDK v3 -->
+		<dependency>
+			<groupId>com.huaweicloud.sdk</groupId>
+			<artifactId>huaweicloud-sdk-core</artifactId>
+			<version>3.0.30-rc</version>
+		</dependency>
+		<dependency>
+			<groupId>com.huaweicloud.sdk</groupId>
+			<artifactId>huaweicloud-sdk-smn</artifactId>
+			<version>3.0.30-rc</version>
+		</dependency>
+
+		<!-- for testing -->
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-test-spring-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-core-catalog</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-test-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
 </project>


[camel] 02/03: CAMEL-16001 - Use Parent pom property placeholders for versions

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 7d6df90b2635551b45d5dc57038f74af830d24ab
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jan 28 07:38:05 2021 +0100

    CAMEL-16001 - Use Parent pom property placeholders for versions
---
 components/camel-huaweicloud-smn/pom.xml | 6 +++---
 parent/pom.xml                           | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/camel-huaweicloud-smn/pom.xml b/components/camel-huaweicloud-smn/pom.xml
index 13d4109..5a8ba69 100644
--- a/components/camel-huaweicloud-smn/pom.xml
+++ b/components/camel-huaweicloud-smn/pom.xml
@@ -40,19 +40,19 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.12.0</version>
+			<version>${jackson2-version}</version>
 		</dependency>
 
 		<!-- HuaweiCloud SDK v3 -->
 		<dependency>
 			<groupId>com.huaweicloud.sdk</groupId>
 			<artifactId>huaweicloud-sdk-core</artifactId>
-			<version>3.0.30-rc</version>
+			<version>${huaweicloud-sdk-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.huaweicloud.sdk</groupId>
 			<artifactId>huaweicloud-sdk-smn</artifactId>
-			<version>3.0.30-rc</version>
+			<version>${huaweicloud-sdk-version}</version>
 		</dependency>
 
 		<!-- for testing -->
diff --git a/parent/pom.xml b/parent/pom.xml
index 15a6b67..947d384 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -248,6 +248,7 @@
         <httpcore4-version>4.4.14</httpcore4-version>
         <httpclient4-version>4.5.13</httpclient4-version>
         <httpasyncclient-version>4.1.4</httpasyncclient-version>
+        <huaweicloud-sdk-version>3.0.30-rc</huaweicloud-sdk-version>
         <hystrix-version>1.5.18</hystrix-version>
         <ical4j-version>1.0.7</ical4j-version>
         <icu4j-version>65.1</icu4j-version>


[camel] 03/03: Sync deps

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 714425e973489b5ba61fb8394f96ceadbd515c8d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jan 28 07:42:19 2021 +0100

    Sync deps
---
 camel-dependencies/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 11b850f..24f332b 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -268,6 +268,7 @@
     <httpclient4-version>4.5.13</httpclient4-version>
     <httpcore4-version>4.4.14</httpcore4-version>
     <httpunit-version>1.7</httpunit-version>
+    <huaweicloud-sdk-version>3.0.30-rc</huaweicloud-sdk-version>
     <hystrix-version>1.5.18</hystrix-version>
     <ical4j-version>1.0.7</ical4j-version>
     <icu4j-version>65.1</icu4j-version>