Issue 686

[dannylamb]

GitHub Issue: Islandora/documentation#686

This will also affect Islandora-Devops/islandora-playbook#13

What does this Pull Request do?

Bumps activemq, camel, and toolbox versions. No longer relying on ranges. This puts us in line with the SNAPSHOT builds of Api-X that we're using.

How should this be tested?

Change https://github.com/Islandora-CLAW/claw_vagrant/blob/master/scripts/alpaca.sh#L12 to git clone -b issue-686 https://github.com/dannylamb/Alpaca.git and then vagrant up. Alpaca and Api-X should get brought up properly, and Fedora syncing should be happening.

Interested parties

@Natkeeran @MarcusBarnes @Islandora-CLAW/committers

[jonathangreen]

Patching this into claw-playbook, seems like all the bundles are starting correctly now.

index 30507d4..d2bd799 100644
--- a/roles/internal/alpaca/tasks/compile.yml
+++ b/roles/internal/alpaca/tasks/compile.yml
@@ -17,9 +17,9 @@
 
 - name: Clone CLAW Alpaca
   git:
-    repo: https://github.com/Islandora-CLAW/Alpaca.git
+    repo: https://github.com/dannylamb/Alpaca.git
     dest: "{{ alpaca_clone_directory }}"
-    version: "{{ alpaca_version }}"
+    version: issue-686
   register: alpaca_git
 
 - name: Install Alpaca via Gradle

TASK [alpaca : Add Alpaca Features] ********************************************
changed: [default] => (item=islandora-http-client)
changed: [default] => (item=islandora-connector-broadcast)
changed: [default] => (item=islandora-indexing-triplestore)
changed: [default] => (item=islandora-indexing-fcrepo)

Doesn't confirm it because things were intermittent before, but its probably a good sign.

[jonathangreen]

@dannylamb it does look like there is a test failure though

java.lang.AssertionError: Predicate failed: exchangeProperty{exchangeProperty(uri)} == http://localhost:8000/fedora_resource/1 evaluated as: null == http://localhost:8000/fedora_resource/1 on Exchange[ID-claw-42606-1505843539446-0-2]

[dannylamb]

@jonathangreen Yeah, just ran tests locally and looks like there might be something with jsonpath in 2.19. Triplestore indexer fails to parse the event properly.

[dannylamb]

diff --git a/islandora-indexing-triplestore/src/test/java/ca/islandora/alpaca/indexing/triplestore/TriplestoreIndexerTest.java b/islandora-indexing-triplestore/src/test/java/ca/islandora/alpaca/indexing/triplestore/TriplestoreIndexerTest.java
index 5efcec4..101afd9 100644
--- a/islandora-indexing-triplestore/src/test/java/ca/islandora/alpaca/indexing/triplestore/TriplestoreIndexerTest.java
+++ b/islandora-indexing-triplestore/src/test/java/ca/islandora/alpaca/indexing/triplestore/TriplestoreIndexerTest.java
@@ -112,7 +112,6 @@ public class TriplestoreIndexerTest extends CamelBlueprintTestSupport {
             @Override
             public void configure() throws Exception {
                 replaceFromWith("direct:start");
-                mockEndpointsAndSkip("*");
             }
         });
         context.start();

I have no idea how this was ever passing in the first place.

[dannylamb]

Oh ho, such fun. ./gradlew --stacktrace build is yielding different results on Travis than on my local machine. Looks like I've got some weird checkstyle issues to deal with.

[codecov]

Codecov Report

Merging #43 into master will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master      #43   +/-   ##
=========================================
  Coverage     91.74%   91.74%           
  Complexity       58       58           
=========================================
  Files             8        8           
  Lines           666      666           
  Branches          3        3           
=========================================
  Hits            611      611           
  Misses           52       52           
  Partials          3        3

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0906cc7...307e3f0. Read the comment docs.

[dannylamb]

Alright, not sure how or why, but Travis started behaving again.

@jonathangreen I guess this is good to go.

[MarcusBarnes]

@dannylamb Will try to test this right now. Thanks.

[MarcusBarnes]

When creating a Islandora Collection and Islandora Image, I'm seeing these objects reflected in Fedora as expected.