[KARAF-6496] Upgrade to OrientDB 3.0.26 and use private for OrientDB (cleaner)
diff --git a/appender/orientdb/pom.xml b/appender/orientdb/pom.xml
index abae6b6..3115735 100644
--- a/appender/orientdb/pom.xml
+++ b/appender/orientdb/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-client</artifactId>
- <version>${orientdb.version}</version>
+ <version>3.0.26</version>
</dependency>
<!-- test -->
@@ -73,10 +73,24 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>!*</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ !com.orientechnologies*,
+ !com.googlecode.concurrentlinkedhashmap,
+ !net.jpountz.lz4,
+ !net.jpountz.util,
+ !net.jpountz.xxhash,
+ com.sun.jna*;resolution:=optional,
+ jdk.nashorn*;resolution:=optional,
+ *
+ </Import-Package>
<Private-Package>
org.apache.karaf.decanter.appender.orientdb,
- org.apache.karaf.decanter.appender.utils
+ org.apache.karaf.decanter.appender.utils,
+ com.orientechnologies*,
+ com.googlecode.concurrentlinkedhashmap,
+ net.jpountz.lz4,
+ net.jpountz.util,
+ net.jpountz.xxhash
</Private-Package>
<_dsannotations>*</_dsannotations>
</instructions>
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 2dca261..e3d49ca 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -397,21 +397,6 @@
<feature name="decanter-appender-orientdb-core" version="${project.version}" description="Karaf Decanter OrientDB Appender core">
<feature>decanter-common</feature>
<feature>http</feature>
- <bundle dependency="true">mvn:com.google.guava/guava/18.0</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.6.3</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.6.3</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.6.3</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.6.3</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/2.6.3</bundle>
- <bundle dependency="true">mvn:com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.4.2</bundle>
- <bundle dependency="true">mvn:com.google.code.findbugs/jsr305/3.0.2</bundle>
- <bundle dependency="true">mvn:net.java.dev.jna/jna/4.0.0</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
- <bundle dependency="true">mvn:org.javassist/javassist/3.18.1-GA</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-core/${orientdb.version}</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-object/${orientdb.version}</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-tools/${orientdb.version}</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-client/${orientdb.version}</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.orientdb/${project.version}</bundle>
</feature>
@@ -609,23 +594,6 @@
<feature>scr</feature>
<feature>http</feature>
<configfile finalname="/etc/orientdb-server-config.xml">mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.orientdb/${project.version}/xml</configfile>
- <bundle dependency="true">mvn:com.google.guava/guava/18.0</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.6.3</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.6.3</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.6.3</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.6.3</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/2.6.3</bundle>
- <bundle dependency="true">mvn:com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.4.2</bundle>
- <bundle dependency="true">mvn:com.google.code.findbugs/jsr305/3.0.2</bundle>
- <bundle dependency="true">mvn:net.java.dev.jna/jna/4.0.0</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
- <bundle dependency="true">mvn:org.javassist/javassist/3.18.1-GA</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-core/${orientdb.version}</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-object/${orientdb.version}</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-tools/${orientdb.version}</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-server/${orientdb.version}</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-client/${orientdb.version}</bundle>
- <bundle dependency="true">mvn:com.orientechnologies/orientdb-graphdb/${orientdb.version}</bundle>
<bundle>mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.orientdb/${project.version}</bundle>
</feature>
diff --git a/backend/orientdb/pom.xml b/backend/orientdb/pom.xml
index 5eac009..c4ba99b 100644
--- a/backend/orientdb/pom.xml
+++ b/backend/orientdb/pom.xml
@@ -37,12 +37,12 @@
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId>
- <version>${orientdb.version}</version>
+ <version>3.0.26</version>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-server</artifactId>
- <version>${orientdb.version}</version>
+ <version>3.0.26</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 67ad4e5..0201801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,6 @@
<kibana.version>3.1.1</kibana.version>
<kibana4.version>4.1.2</kibana4.version>
<kibana6.version>6.1.1</kibana6.version>
- <orientdb.version>2.2.31</orientdb.version>
<paho.version>1.0.2</paho.version>
<redisson.version>2.2.8</redisson.version>
<slf4j.version>1.7.7</slf4j.version>
