Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update various component versions to allow for API-X integration #27

Merged
merged 6 commits into from
Jan 27, 2017
Merged

Update various component versions to allow for API-X integration #27

merged 6 commits into from
Jan 27, 2017

Conversation

ruebot
Copy link
Member

@ruebot ruebot commented Jan 26, 2017

Partially resolves Islandora/documentation#504

See: islandora-deprecated/claw_vagrant#3 (comment)

How to test:

  • If it builds, we should be ok

@dannylamb @acoburn eyes from you would be appreciated :-)

I cherry-picked the #26 commit here so I didn't have to rebase. Proactively lazy.

@dannylamb
Copy link
Contributor

@ruebot Let me pull this down and investigate. I'm seeing some dependencies that might need to get pruned on top of what you've done, like https://github.com/Islandora-CLAW/Alpaca/pull/27/files#diff-c197962302397baf3a4cc36463dce5eaR47 and https://github.com/Islandora-CLAW/Alpaca/pull/27/files#diff-c197962302397baf3a4cc36463dce5eaL53

@@ -46,14 +46,14 @@ subprojects {

camelVersion = '2.17.1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.18.1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruebot Take care of this and we're good to go here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How'd I miss that! Heh, I swear that was one of the first things I did :-)

activemqVersion = '5.13.2'
fcrepoCamelVersion = '4.5.0'
fcrepoCamelToolboxVersion = '4.7.0'
activemqVersion = '5.14.0'
commonsIoVersion = '2.4'
cxfVersion = '3.1.4'
mustacheVersion = '0.9.0'
Copy link
Contributor

@dannylamb dannylamb Jan 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commonsio, cxf, and mustache can be removed

commonsIoVersion = '2.4'
cxfVersion = '3.1.4'
mustacheVersion = '0.9.0'

camelVersionRange = '[2.17, 3)'
camelVersionRange = '2.18.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be [2.18.0, 3)

@dannylamb
Copy link
Contributor

tested deployment on that, and it's exposing a flaw. hang on, we may be using fcrepo-camel-toolbox after all for the broker.

@dannylamb
Copy link
Contributor

dannylamb commented Jan 26, 2017

@ruebot I've managed to sort out the runtime dependency fails preventing deployment. We'll need to make some changes on the features file and islandora-connector-broadcast's blueprint.xml to use the activemq component exposed by fcrepo-camel-toolbox.

https://github.com/Islandora-CLAW/Alpaca/blob/e651f292b447530abff187ccab29636999d547dc/karaf/src/main/resources/features.xml#L5 needs to look like <repository>mvn:org.fcrepo.camel/toolbox-features/${fcrepoCamelToolboxVersion}/xml/features</repository>. Its artifact name is 'toolbox-features' not 'fcrepo-camel-toolbox'. This will make the camel toolbox features available for install in Karaf.

We also need to add <feature version="${fcrepoCamelToolboxVersion}">fcrepo-service-activemq</feature> here: https://github.com/Islandora-CLAW/Alpaca/blob/e651f292b447530abff187ccab29636999d547dc/karaf/src/main/resources/features.xml#L28. This will actually install the feature that publishes an activemq component under the name fcrepo/Broker.

Finally, we need to tell the broadcaster to use fcrepo/Broker in its Blueprint XML. Right now we're currently using Amherst's broker (which they've stopped using in favor of fcrepo/Broker as well). So just change acrepo/Broker to fcrepo/Broker here https://github.com/Islandora-CLAW/Alpaca/blob/e651f292b447530abff187ccab29636999d547dc/islandora-connector-broadcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml#L16

Tag me if you run into any issues.

@dannylamb dannylamb merged commit 8233772 into Islandora:master Jan 27, 2017
@ruebot ruebot deleted the issue-504 branch January 27, 2017 03:56
@ruebot
Copy link
Member Author

ruebot commented Jan 27, 2017

@dannylamb should we cut a 0.2.0 release of this given the significance of what we just did here? Don't think it'd be 0.1.1 since it wasn't a patch fix. I'm happy to turn the release gears here if you'd like.

@dannylamb
Copy link
Contributor

Yes, but there's some significant changes to the triplestore indexer I'd like to get in before hand. Let me tackle Islandora/documentation#394 first.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add API-X to vagrant install
2 participants