You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/07/14 08:27:09 UTC
[1/2] karaf-decanter git commit: [KARAF-4558] Upgrade to
elasticsearch 1.7.4
Repository: karaf-decanter
Updated Branches:
refs/heads/master 6225e9211 -> 43bd9dba4
[KARAF-4558] Upgrade to elasticsearch 1.7.4
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/3a2a59d5
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/3a2a59d5
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/3a2a59d5
Branch: refs/heads/master
Commit: 3a2a59d56b00552e63fd227602d06606dc94ddcc
Parents: 6225e92
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Jul 14 10:24:52 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Jul 14 10:24:52 2016 +0200
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/3a2a59d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4474726..88998a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,8 @@
<camel.version>2.13.2</camel.version>
<cassandra.version>2.2.4</cassandra.version>
<cassandra.driver.version>2.2.0-rc1</cassandra.driver.version>
- <elasticsearch1.version>1.7.3</elasticsearch1.version>
- <elasticsearch1.bundle.version>1.7.3_1</elasticsearch1.bundle.version>
+ <elasticsearch1.version>1.7.4</elasticsearch1.version>
+ <elasticsearch1.bundle.version>1.7.4_1</elasticsearch1.bundle.version>
<elasticsearch2.version>2.2.0</elasticsearch2.version>
<elasticsearch2.bundle.version>2.2.0_1</elasticsearch2.bundle.version>
<glassfish-json.version>1.0.4</glassfish-json.version>
@@ -176,6 +176,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.10</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
[2/2] karaf-decanter git commit: Define slf4j-simple for test
Posted by jb...@apache.org.
Define slf4j-simple for test
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/43bd9dba
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/43bd9dba
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/43bd9dba
Branch: refs/heads/master
Commit: 43bd9dba4eb0f54d9a2c4f91c4e42ab9b96f2e60
Parents: 3a2a59d
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Jul 14 10:26:10 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Jul 14 10:26:10 2016 +0200
----------------------------------------------------------------------
appender/elasticsearch-native-1.x/pom.xml | 5 +++++
appender/elasticsearch-native-2.x/pom.xml | 5 +++++
appender/elasticsearch-rest/pom.xml | 5 +++++
collector/log4j-socket/pom.xml | 6 ++++++
elasticsearch-1.x/pom.xml | 6 ++++++
elasticsearch-2.x/pom.xml | 6 ++++++
6 files changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/43bd9dba/appender/elasticsearch-native-1.x/pom.xml
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-native-1.x/pom.xml b/appender/elasticsearch-native-1.x/pom.xml
index 53de53b..6c0621b 100644
--- a/appender/elasticsearch-native-1.x/pom.xml
+++ b/appender/elasticsearch-native-1.x/pom.xml
@@ -53,6 +53,11 @@
<artifactId>org.apache.karaf.decanter.marshaller.json</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/43bd9dba/appender/elasticsearch-native-2.x/pom.xml
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-native-2.x/pom.xml b/appender/elasticsearch-native-2.x/pom.xml
index 6d5285a..2b9dcc0 100644
--- a/appender/elasticsearch-native-2.x/pom.xml
+++ b/appender/elasticsearch-native-2.x/pom.xml
@@ -53,6 +53,11 @@
<artifactId>org.apache.karaf.decanter.marshaller.json</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/43bd9dba/appender/elasticsearch-rest/pom.xml
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-rest/pom.xml b/appender/elasticsearch-rest/pom.xml
index 7fb8884..ed1fea4 100644
--- a/appender/elasticsearch-rest/pom.xml
+++ b/appender/elasticsearch-rest/pom.xml
@@ -56,6 +56,11 @@
<artifactId>org.apache.karaf.decanter.marshaller.json</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/43bd9dba/collector/log4j-socket/pom.xml
----------------------------------------------------------------------
diff --git a/collector/log4j-socket/pom.xml b/collector/log4j-socket/pom.xml
index f0e77f5..5eb9467 100644
--- a/collector/log4j-socket/pom.xml
+++ b/collector/log4j-socket/pom.xml
@@ -38,6 +38,12 @@
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/43bd9dba/elasticsearch-1.x/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-1.x/pom.xml b/elasticsearch-1.x/pom.xml
index b427a01..8f20bea 100644
--- a/elasticsearch-1.x/pom.xml
+++ b/elasticsearch-1.x/pom.xml
@@ -39,6 +39,12 @@
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch1.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/43bd9dba/elasticsearch-2.x/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.x/pom.xml b/elasticsearch-2.x/pom.xml
index 47c9635..1ac6c67 100644
--- a/elasticsearch-2.x/pom.xml
+++ b/elasticsearch-2.x/pom.xml
@@ -39,6 +39,12 @@
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch2.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>