You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2019/11/05 19:39:17 UTC

[camel] branch master updated (9c6de95 -> 1085c9b)

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

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


    from 9c6de95  Regen docs
     new 0c0db7b  Upgrade Commons Text to version 1.8
     new 5fac5a4  Upgrade SLF4J to version 1.7.29
     new cbe702d  Upgrade JSoup to version 1.12.1
     new c8e5dcb  Remove unused dependency management for JRuby.
     new 1085c9b  Remove unused dependency management for scriptengines.

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:
 parent/pom.xml                                     | 31 +++-------------------
 .../camel-spring-boot-dependencies/pom.xml         | 20 --------------
 2 files changed, 4 insertions(+), 47 deletions(-)


[camel] 02/05: Upgrade SLF4J to version 1.7.29

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

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

commit 5fac5a4d0fee13846bff3bee56d3c0ae01b104b3
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Tue Nov 5 20:18:58 2019 +0100

    Upgrade SLF4J to version 1.7.29
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 3988560..d8b97f1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -567,8 +567,8 @@
         <shrinkwrap-resolver-version>3.1.3</shrinkwrap-resolver-version>
         <shrinkwrap-version>1.2.6</shrinkwrap-version>
         <sip-api-version>1.1</sip-api-version>
-        <slf4j-api-version>1.7.28</slf4j-api-version>
-        <slf4j-version>1.7.28</slf4j-version>
+        <slf4j-api-version>1.7.29</slf4j-api-version>
+        <slf4j-version>1.7.29</slf4j-version>
         <smack-version>4.3.4</smack-version>
         <smallrye-config-version>1.0.0</smallrye-config-version>
         <smallrye-metrics-version>2.2.0</smallrye-metrics-version>


[camel] 04/05: Remove unused dependency management for JRuby.

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

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

commit c8e5dcbb7ba85887ce8534c0cd1d67c0e10d1a4d
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Tue Nov 5 20:27:36 2019 +0100

    Remove unused dependency management for JRuby.
---
 parent/pom.xml                                               | 12 ------------
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml    | 10 ----------
 2 files changed, 22 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 426c91d..8e6f1ad 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -374,8 +374,6 @@
         <johnzon-version>1.2.1</johnzon-version>
         <jose4j-version>0.6.4</jose4j-version>
         <josql-bundle-version>1.5_5</josql-bundle-version>
-        <!-- Upgrade to 1.7.26 causes stability issues. See CAMEL-10477 -->
-        <jruby-version>1.7.18</jruby-version>
         <jsendnsca-version>2.1.1</jsendnsca-version>
         <jsmpp-version>2.3.7</jsmpp-version>
         <jsch-version>0.1.55</jsch-version>
@@ -5058,16 +5056,6 @@
                 <version>${scriptengines-version}</version>
             </dependency>
             <dependency>
-                <groupId>org.jruby</groupId>
-                <artifactId>jruby</artifactId>
-                <version>${jruby-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jruby</groupId>
-                <artifactId>jruby-complete</artifactId>
-                <version>${jruby-version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.python</groupId>
                 <artifactId>jython</artifactId>
                 <version>${jython-version}</version>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 2c4089a..87f62f0 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3881,16 +3881,6 @@
         <version>2.4.4</version>
       </dependency>
       <dependency>
-        <groupId>org.jruby</groupId>
-        <artifactId>jruby</artifactId>
-        <version>1.7.18</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jruby</groupId>
-        <artifactId>jruby-complete</artifactId>
-        <version>1.7.18</version>
-      </dependency>
-      <dependency>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-core</artifactId>
         <version>4.4.0</version>


[camel] 05/05: Remove unused dependency management for scriptengines.

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

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

commit 1085c9b8dfbe83063aa8c88e3ce1125704fa3748
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Tue Nov 5 20:29:49 2019 +0100

    Remove unused dependency management for scriptengines.
---
 parent/pom.xml                                                | 11 -----------
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml     | 10 ----------
 2 files changed, 21 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 8e6f1ad..082a501 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -556,7 +556,6 @@
         <scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>
         <scribe-version>1.3.7</scribe-version>
         <scribe-bundle-version>1.3.7_1</scribe-bundle-version>
-        <scriptengines-version>1.1.1</scriptengines-version>
         <serp-bundle-version>1.14.1_1</serp-bundle-version>
         <servicemix-specs-version>2.9.0</servicemix-specs-version>
         <servlet-version-range>[3,4)</servlet-version-range>
@@ -5046,16 +5045,6 @@
 
             <!-- optional misc -->
             <dependency>
-                <groupId>com.google.code.scriptengines</groupId>
-                <artifactId>scriptengines-javascript</artifactId>
-                <version>${scriptengines-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.scriptengines</groupId>
-                <artifactId>scriptengines-jruby</artifactId>
-                <version>${scriptengines-version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.python</groupId>
                 <artifactId>jython</artifactId>
                 <version>${jython-version}</version>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 87f62f0..0c37a2a 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -96,16 +96,6 @@
         <version>0.9</version>
       </dependency>
       <dependency>
-        <groupId>com.google.code.scriptengines</groupId>
-        <artifactId>scriptengines-javascript</artifactId>
-        <version>1.1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.scriptengines</groupId>
-        <artifactId>scriptengines-jruby</artifactId>
-        <version>1.1.1</version>
-      </dependency>
-      <dependency>
         <groupId>com.google.truth</groupId>
         <artifactId>truth</artifactId>
         <version>0.30</version>


[camel] 03/05: Upgrade JSoup to version 1.12.1

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

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

commit cbe702d9d008557abec991435c2136a669a2c97f
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Tue Nov 5 20:21:15 2019 +0100

    Upgrade JSoup to version 1.12.1
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index d8b97f1..426c91d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -386,7 +386,7 @@
         <json-path-version>2.4.0</json-path-version>
         <json-simple-version>1.1.1</json-simple-version>
         <json-smart-version>2.3</json-smart-version>
-        <jsoup-version>1.11.3</jsoup-version>
+        <jsoup-version>1.12.1</jsoup-version>
         <jt400-version>9.8</jt400-version>
         <jt400-bundle-version>9.8_1</jt400-bundle-version>
         <juel-bundle-version>2.1.3_1</juel-bundle-version>


[camel] 01/05: Upgrade Commons Text to version 1.8

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

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

commit 0c0db7b4f2e38a9b3af7d6b68f3ee11e5b13cacb
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Tue Nov 5 20:15:52 2019 +0100

    Upgrade Commons Text to version 1.8
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index fb17ae4..3988560 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -143,7 +143,7 @@
         <commons-net-version>3.6</commons-net-version>
         <commons-pool-version>1.6</commons-pool-version>
         <commons-pool2-version>2.7.0</commons-pool2-version>
-        <commons-text-version>1.6</commons-text-version>
+        <commons-text-version>1.8</commons-text-version>
         <compress-lzf-version>1.0.4</compress-lzf-version>
         <consul-client-version>1.3.3</consul-client-version>
         <consul-client-bundle-version>1.3.3_1</consul-client-bundle-version>