From aced86b113c2fe6601e80bad1e3da8feb194d56e Mon Sep 17 00:00:00 2001 From: dbernstein Date: Thu, 7 Feb 2019 11:25:07 -0800 Subject: [PATCH] FCREPO-2987: Updates fcrepo-parent version to 5.0.1 (#149) * Updates fcrepo-parent version to 5.0.1 Resolves: https://jira.duraspace.org/browse/FCREPO-2987 * Updates version to 5.0.0-SNAPSHOT for continued development. --- pom.xml | 30 +++++++++++++------ .../java/org/fcrepo/camel/FcrepoEndpoint.java | 2 +- .../java/org/fcrepo/camel/FcrepoProducer.java | 2 +- .../org/fcrepo/camel/integration/KarafIT.java | 16 ++++++---- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index d3bed25..5824553 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ org.fcrepo fcrepo-parent - 4.7.5 + 5.0.1 org.fcrepo.camel fcrepo-camel bundle - 4.6.0-SNAPSHOT + 5.0.0-SNAPSHOT Fcrepo Camel Component Camel Component for interacting with a Fedora Repository @@ -37,18 +37,18 @@ github - 5.14.0 - 2.18.2 - [2.18,3) + 5.15.5 + 2.19.5 + [2.19.5,3) 2.4 - 3.7 + 3.8.1 4.5.2 - 4.0.6 + 4.2.2 3.1.1 1.10.8 - 4.8.0 + 4.13.1 1.7.20 - 4.2.5.RELEASE + 4.3.22.RELEASE 5.0.1 0.4.0 @@ -206,6 +206,12 @@ camel-test-karaf ${camel.version} test + + + org.ops4j.pax.exam + pax-exam + + @@ -339,10 +345,16 @@ ${fcrepo.dynamic.stomp.port} ${commons.codec.version} ${commons.csv.version} + ${commons.lang3.version} + ${camel.version} ${dexx-collection.version} ${httpclient.version} ${httpcore.version} ${jsonld.version} + ${jena.version} + ${jsonld.version} + ${fcrepo-java-client.version} + ${thrift.version} ${karaf.ssh.port} ${karaf.rmiRegistry.port} diff --git a/src/main/java/org/fcrepo/camel/FcrepoEndpoint.java b/src/main/java/org/fcrepo/camel/FcrepoEndpoint.java index b2f1d78..bbab69d 100644 --- a/src/main/java/org/fcrepo/camel/FcrepoEndpoint.java +++ b/src/main/java/org/fcrepo/camel/FcrepoEndpoint.java @@ -99,7 +99,7 @@ public boolean isSingleton() { * @return a transaction template */ public TransactionTemplate createTransactionTemplate() { - TransactionTemplate transactionTemplate; + final TransactionTemplate transactionTemplate; if (getTransactionManager() != null) { transactionTemplate = new TransactionTemplate(getTransactionManager()); diff --git a/src/main/java/org/fcrepo/camel/FcrepoProducer.java b/src/main/java/org/fcrepo/camel/FcrepoProducer.java index 88d733e..e629f1a 100644 --- a/src/main/java/org/fcrepo/camel/FcrepoProducer.java +++ b/src/main/java/org/fcrepo/camel/FcrepoProducer.java @@ -166,7 +166,7 @@ private void doRequest(final Exchange exchange, final String transaction) throws LOGGER.debug("Fcrepo Request [{}] with method [{}]", url, method); - FcrepoResponse response; + final FcrepoResponse response; switch (method) { case PATCH: diff --git a/src/test/java/org/fcrepo/camel/integration/KarafIT.java b/src/test/java/org/fcrepo/camel/integration/KarafIT.java index a57aecf..a738a4c 100644 --- a/src/test/java/org/fcrepo/camel/integration/KarafIT.java +++ b/src/test/java/org/fcrepo/camel/integration/KarafIT.java @@ -62,14 +62,20 @@ public Option[] config() { final String fcrepoCamelBundle = "file:" + getBaseDir() + "/target/" + artifactName + ".jar"; final String commonsCodecVersion = cm.getProperty("commons.codec.version"); final String commonsCsvVersion = cm.getProperty("commons.csv.version"); + final String commonsLang3Version = cm.getProperty("commons.lang3.version"); final String dexxVersion = cm.getProperty("dexx.version"); final String httpclientVersion = cm.getProperty("httpclient.version"); final String httpcoreVersion = cm.getProperty("httpcore.version"); final String jsonldVersion = cm.getProperty("jsonld.version"); + final String jenaOsgiVersion = cm.getProperty("jena.osgi.version"); + final String javaClientVersion = cm.getProperty("fcrepo.client.version"); + + final String thriftVersion = cm.getProperty("thrift.version"); final String rmiRegistryPort = cm.getProperty("karaf.rmiRegistry.port"); final String rmiServerPort = cm.getProperty("karaf.rmiServer.port"); final String sshPort = cm.getProperty("karaf.ssh.port"); + return new Option[] { karafDistributionConfiguration() .frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf") @@ -89,13 +95,13 @@ public Option[] config() { mavenBundle().groupId("org.apache.camel").artifactId("camel-test-karaf").versionAsInProject(), mavenBundle().groupId("commons-codec").artifactId("commons-codec").version(commonsCodecVersion), mavenBundle().groupId("org.apache.commons").artifactId("commons-csv").version(commonsCsvVersion), - mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").versionAsInProject(), - mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(), - mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(), - mavenBundle().groupId("org.apache.jena").artifactId("jena-osgi").versionAsInProject(), + mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(commonsLang3Version), + mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(httpclientVersion), + mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(httpcoreVersion), + mavenBundle().groupId("org.apache.jena").artifactId("jena-osgi").version(jenaOsgiVersion), mavenBundle().groupId("com.github.jsonld-java").artifactId("jsonld-java").version(jsonldVersion), mavenBundle().groupId("org.apache.thrift").artifactId("libthrift").version(thriftVersion), - mavenBundle().groupId("org.fcrepo.client").artifactId("fcrepo-java-client").versionAsInProject(), + mavenBundle().groupId("org.fcrepo.client").artifactId("fcrepo-java-client").version(javaClientVersion), mavenBundle().groupId("com.github.andrewoma.dexx").artifactId("collection").version(dexxVersion), bundle(fcrepoCamelBundle).start() };