You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/10/02 12:28:22 UTC

[plc4x] 01/02: - Bumped the version of the build-tools code-generation to the just released version - Bumped the versions of the calcite, camel, karaf versions to the latest versions

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

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 34995ac707f479fedc3e45077cc74a0727c3f23f
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Oct 2 14:27:04 2019 +0200

    - Bumped the version of the build-tools code-generation to the just released version
    - Bumped the versions of the calcite, camel, karaf versions to the latest versions
---
 plc4j/integrations/apache-calcite/pom.xml |  2 +-
 plc4j/integrations/apache-camel/pom.xml   |  2 +-
 plc4j/integrations/apache-karaf/pom.xml   |  2 +-
 pom.xml                                   | 16 ++++++++++------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/plc4j/integrations/apache-calcite/pom.xml b/plc4j/integrations/apache-calcite/pom.xml
index b0cce04..3872324 100644
--- a/plc4j/integrations/apache-calcite/pom.xml
+++ b/plc4j/integrations/apache-calcite/pom.xml
@@ -31,7 +31,7 @@
   <name>PLC4J: Integrations: Apache Calcite</name>
 
   <properties>
-    <calcite-core.version>1.17.0</calcite-core.version>
+    <calcite-core.version>1.21.0</calcite-core.version>
   </properties>
 
   <dependencies>
diff --git a/plc4j/integrations/apache-camel/pom.xml b/plc4j/integrations/apache-camel/pom.xml
index 176af17..3d1847a 100644
--- a/plc4j/integrations/apache-camel/pom.xml
+++ b/plc4j/integrations/apache-camel/pom.xml
@@ -33,7 +33,7 @@
   <description>Integration module for integrating PLC4X into Apache Camel.</description>
 
   <properties>
-    <camel.version>2.23.1</camel.version>
+    <camel.version>2.24.2</camel.version>
   </properties>
 
   <dependencies>
diff --git a/plc4j/integrations/apache-karaf/pom.xml b/plc4j/integrations/apache-karaf/pom.xml
index b3b5227..093431b 100644
--- a/plc4j/integrations/apache-karaf/pom.xml
+++ b/plc4j/integrations/apache-karaf/pom.xml
@@ -35,7 +35,7 @@
   <description>Integration module for integrating PLC4X into Apache Karaf.</description>
 
   <properties>
-    <karaf.version>4.2.2</karaf.version>
+    <karaf.version>4.2.7</karaf.version>
     <karaf-maven-plugin.version>${karaf.version}</karaf-maven-plugin.version>
   </properties>
 
diff --git a/pom.xml b/pom.xml
index 2d99014..52950de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,9 +102,7 @@
     <!-- Exclude all generated code -->
     <sonar.exclusions>**/generated-sources</sonar.exclusions>
 
-
-    <!--plc4x-code-generation.version>1.0.0</plc4x-code-generation.version-->
-    <plc4x-code-generation.version>1.0.0-SNAPSHOT</plc4x-code-generation.version>
+    <plc4x-code-generation.version>1.0.0</plc4x-code-generation.version>
 
     <antlr.version>4.7.2</antlr.version>
     <asm.version>5.0.4</asm.version>
@@ -126,7 +124,7 @@
     <commons-pool2.version>2.6.0</commons-pool2.version>
     <commons-text.version>1.8</commons-text.version>
     <crc.version>1.0.1</crc.version>
-    <elasticsearch.version>7.2.0</elasticsearch.version>
+    <elasticsearch.version>7.4.0</elasticsearch.version>
     <equalsverifier.version>3.0.2</equalsverifier.version>
     <findbugs.version>3.0.1</findbugs.version>
     <freemarker.version>2.3.28</freemarker.version>
@@ -134,6 +132,7 @@
     <gson.version>2.8.5</gson.version>
     <guava.version>27.0.1-jre</guava.version>
     <hamcrest.version>1.3</hamcrest.version>
+    <httpclient.version>4.5.10</httpclient.version>
     <jackson.version>2.9.9</jackson.version>
     <jmh.version>1.21</jmh.version>
     <jna.version>5.3.1</jna.version>
@@ -145,7 +144,7 @@
     <junit.version>4.12</junit.version>
     <log4j.version>2.11.1</log4j.version>
     <logback.version>1.2.3</logback.version>
-    <logstash.version>7.3.0</logstash.version>
+    <logstash.version>7.4.0</logstash.version>
     <lucene.version>8.0.0</lucene.version>
     <metrics-core.version>3.1.2</metrics-core.version>
     <mockito.version>2.24.5</mockito.version>
@@ -329,6 +328,11 @@
         <version>${netty.version}</version>
       </dependency>
       <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>1.3.2</version>
+      </dependency>
+      <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
         <version>2.3.1</version>
@@ -422,7 +426,7 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.4.10</version>
+        <version>4.4.12</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>