feat(basex): update BaseX to Version 9.1.1

Required for EIP etf-validator/governance#57 Signed-off-by: Jon Herrmann <[email protected]>
interactive-instruments · Jan 22, 2019 · 377599f · 377599f
1 parent 5c9f4bc
commit 377599f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,8 +28,8 @@ apply from: 'build/gradle/ii-bda.gradle'
 group = 'de.interactive_instruments.etf'
 description = "ETF BaseX data source"
 
-ext.basexVersion = '8.6.7'
-ext.moxyVersion = '2.7.0'
+ext.basexVersion = '9.1.1'
+ext.moxyVersion = '2.7.4'
 
 ext.testDataStorageDir = project.hasProperty('etf.ds.dir') ?
         project.getProperty('etf.ds.dir') :
@@ -49,9 +49,9 @@ dependencies {
     compileOnly group: 'de.interactive_instruments.etf', name: 'etf-core', version:'1.1.0'+project.snapshotSuffix
     compileOnly group: 'de.interactive_instruments.etf', name: 'etf-spi', version:'1.0.1'+project.snapshotSuffix
 
-    compile group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.5.6'
+    compile group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.6.2'
 
-    compile group: 'net.bytebuddy', name: 'byte-buddy', version: '1.4.33'
+    compile group: 'net.bytebuddy', name: 'byte-buddy', version: '1.9.7'
 
     compile group: 'commons-io', name: 'commons-io', version: etf_commonsIoVersion
 
@@ -70,9 +70,6 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: etf_junitTestVersion
     testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: etf_logbackVersion
-
-    // Todo remove
-    // testCompile group: 'de.interactive_instruments.etf', name: 'etf-stdtot', version:'1.0.1'+project.snapshotSuffix
 }
 
 test {

diff --git a/src/main/java/de/interactive_instruments/etf/dal/dao/basex/AbstractBsxWriteDao.java b/src/main/java/de/interactive_instruments/etf/dal/dao/basex/AbstractBsxWriteDao.java
@@ -384,7 +384,7 @@ protected void updateProperty(final Collection<EID> ids, final String propertyXp
             final Iter iter = proc.iter();
             for (Item item; (item = iter.next()) != null;) {
                 final EID eid = EidFactory.getDefault().createUUID(
-                        new String(((DBNode) item).attribute("id")));
+                        new String(((DBNode) item).attribute("id".getBytes())));
                 final IFile file = getFile(eid);
                 if (!file.exists()) {
                     ctx.getLogger().error("Can not find backup file for {}", eid);

diff --git a/src/main/java/de/interactive_instruments/etf/dal/dao/basex/BsxDataStorage.java b/src/main/java/de/interactive_instruments/etf/dal/dao/basex/BsxDataStorage.java
@@ -386,7 +386,7 @@ private void initBsxDatabase() throws MissingPropertyException, IOException, Ini
         try {
             // Check for functx
             boolean functxFound = false;
-            for (final Pkg pkg : repoManger.all()) {
+            for (final Pkg pkg : repoManger.packages()) {
                 if ("http://www.functx.com".equals(pkg.name())) {
                     functxFound = true;
                 }