You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/08/18 13:16:55 UTC

[camel-k-runtime] branch master updated (9192091 -> 0cd6a87)

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

lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.


    from 9192091  chore(build): migrate deprecate classes
     new e24c31d  chore(deps): update semver4j to v3.0.0
     new 87f9e7f  chore(deps): update snakeyaml to v1.25
     new 6e5ee48  chore(deps): update maven-versions-rules
     new 4ceba40  chore(deps): update maven deps to v3.6.1
     new 0cd6a87  chore(deps): use jackson-bom to manage jackson dependencies

The 5 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:
 .maven-versions-rules.xml            | 10 ++++++----
 camel-k-loader-yaml/pom.xml          |  2 --
 camel-knative/pom.xml                |  2 --
 pom.xml                              | 13 ++++++++++---
 tooling/camel-k-maven-plugin/pom.xml | 25 ++++++++++++++-----------
 5 files changed, 30 insertions(+), 22 deletions(-)


[camel-k-runtime] 05/05: chore(deps): use jackson-bom to manage jackson dependencies

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit 0cd6a87ac5f81e77ebe719e4d4dc33f1ebb49fc5
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Aug 18 15:16:33 2019 +0200

    chore(deps): use jackson-bom to manage jackson dependencies
---
 camel-k-loader-yaml/pom.xml          |  2 --
 camel-knative/pom.xml                |  2 --
 pom.xml                              |  9 ++++++++-
 tooling/camel-k-maven-plugin/pom.xml | 11 ++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/camel-k-loader-yaml/pom.xml b/camel-k-loader-yaml/pom.xml
index b456c4e..735bcc3 100644
--- a/camel-k-loader-yaml/pom.xml
+++ b/camel-k-loader-yaml/pom.xml
@@ -49,12 +49,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
 
         <!-- ****************************** -->
diff --git a/camel-knative/pom.xml b/camel-knative/pom.xml
index 50f6cd0..5880c0b 100644
--- a/camel-knative/pom.xml
+++ b/camel-knative/pom.xml
@@ -71,12 +71,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 66de6b6..e9c0068 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <kotlin.version>1.3.41</kotlin.version>
         <snakeyaml.version>1.25</snakeyaml.version>
         <spock.version>1.3-groovy-2.5</spock.version>
-        <jackson.version>2.9.9</jackson.version>
+        <jackson.version>2.9.9.20190807</jackson.version>
         <jaxb-api.version>2.3.0</jaxb-api.version>
         <jaxb-core.version>2.3.0.1</jaxb-core.version>
         <immutables.version>2.7.5</immutables.version>
@@ -244,6 +244,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.camel.k</groupId>
diff --git a/tooling/camel-k-maven-plugin/pom.xml b/tooling/camel-k-maven-plugin/pom.xml
index e0dc9cc..43e2686 100644
--- a/tooling/camel-k-maven-plugin/pom.xml
+++ b/tooling/camel-k-maven-plugin/pom.xml
@@ -105,12 +105,14 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jdk8</artifactId>
-      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
     </dependency>
 
     <dependency>
@@ -135,11 +137,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>20.0</version>


[camel-k-runtime] 04/05: chore(deps): update maven deps to v3.6.1

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit 4ceba403191f53e5372952666f943fe2b46443f1
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Aug 18 14:52:27 2019 +0200

    chore(deps): update maven deps to v3.6.1
---
 tooling/camel-k-maven-plugin/pom.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tooling/camel-k-maven-plugin/pom.xml b/tooling/camel-k-maven-plugin/pom.xml
index fa8e2e2..e0dc9cc 100644
--- a/tooling/camel-k-maven-plugin/pom.xml
+++ b/tooling/camel-k-maven-plugin/pom.xml
@@ -29,11 +29,17 @@
 
   <artifactId>camel-k-maven-plugin</artifactId>
 
+  <properties>
+    <maven.version>3.6.1</maven.version>
+    <maven-plugin-tools.version>3.6.0</maven-plugin-tools.version>
+    <maven-shaded.version>3.1.0</maven-shaded.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.6.0</version>
+      <version>${maven.version}</version>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
@@ -44,7 +50,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.6.0</version>
+      <version>${maven-plugin-tools.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
@@ -55,7 +61,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-common-artifact-filters</artifactId>
-      <version>3.1.0</version>
+      <version>${maven-shaded.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.maven</groupId>
@@ -70,7 +76,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.6.0</version>
+      <version>${maven.version}</version>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>


[camel-k-runtime] 03/05: chore(deps): update maven-versions-rules

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit 6e5ee48b4a203c7314c67d1e8a0b1f742783f2e2
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Aug 18 14:47:43 2019 +0200

    chore(deps): update maven-versions-rules
---
 .maven-versions-rules.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.maven-versions-rules.xml b/.maven-versions-rules.xml
index 44e512b..3894e4d 100644
--- a/.maven-versions-rules.xml
+++ b/.maven-versions-rules.xml
@@ -17,9 +17,9 @@
     limitations under the License.
 
 -->
-<ruleset xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" 
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        comparisonMethod="maven" 
+<ruleset xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        comparisonMethod="maven"
         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
 
     <ignoreVersions>
@@ -31,9 +31,11 @@
         <ignoreVersion type="regex">(?i).*RC(?:-?\d+)?</ignoreVersion>
         <ignoreVersion type="regex">(?i).*CR(?:-?\d+)?</ignoreVersion>
         <ignoreVersion type="regex">(?i).*M(?:-?\d+)?</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*pr1?</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*CriteriaPreview.*?</ignoreVersion>
     </ignoreVersions>
 
     <rules>
     </rules>
-    
+
 </ruleset>
\ No newline at end of file


[camel-k-runtime] 02/05: chore(deps): update snakeyaml to v1.25

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit 87f9e7fef518ca1d1fafbc166262e04b43712a00
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Aug 18 14:47:23 2019 +0200

    chore(deps): update snakeyaml to v1.25
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d17c06f..66de6b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
         <slf4j.version>1.7.28</slf4j.version>
         <groovy.version>2.5.8</groovy.version>
         <kotlin.version>1.3.41</kotlin.version>
-        <snakeyaml.version>1.24</snakeyaml.version>
+        <snakeyaml.version>1.25</snakeyaml.version>
         <spock.version>1.3-groovy-2.5</spock.version>
         <jackson.version>2.9.9</jackson.version>
         <jaxb-api.version>2.3.0</jaxb-api.version>


[camel-k-runtime] 01/05: chore(deps): update semver4j to v3.0.0

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit e24c31d9d8dd29cd5ef6ecb9af644dad98b0e9c4
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Aug 18 14:47:03 2019 +0200

    chore(deps): update semver4j to v3.0.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 21a7a89..d17c06f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <jaxb-api.version>2.3.0</jaxb-api.version>
         <jaxb-core.version>2.3.0.1</jaxb-core.version>
         <immutables.version>2.7.5</immutables.version>
-        <semver4j.version>2.2.0</semver4j.version>
+        <semver4j.version>3.0.0</semver4j.version>
         <undertow.version>1.4.26.Final</undertow.version>
         <graalvm.version>19.1.1</graalvm.version>
         <gmavenplus-plugin.version>1.7.1</gmavenplus-plugin.version>