From 8dd94bd8bed856b0c422df51aa37e54f0c9675d9 Mon Sep 17 00:00:00 2001 From: Ian Moore Date: Wed, 4 Jul 2012 13:01:21 +0100 Subject: [PATCH] dependency updates --- pom.xml | 28 ++++++------------- ...jectDependenciesComponentConfigurator.java | 14 ++-------- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index d504330..c4ae15c 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.3.RC2 10.0 1.9.0-rc1 - 0.0.5-SNAPSHOT + 0.0.5 2.2.1 @@ -127,21 +127,25 @@ org.apache.maven maven-artifact ${maven.version} + provided org.apache.maven maven-plugin-api ${maven.version} + provided org.apache.maven maven-project ${maven.version} + provided org.apache.maven maven-model ${maven.version} + provided org.apache.maven @@ -177,30 +181,17 @@ test - junit junit 4.10 - - - - - com.google.guava - guava - ${guava.version} - - org.mockito - mockito-all - ${mockito.version} - - - + com.technophobia.substeps substeps-core ${substeps.version} + @@ -232,8 +223,5 @@ ${substeps-runner.scm} ${substeps-runner.scm.url} - - - - + diff --git a/src/main/java/com/technophobia/substeps/runner/IncludeProjectDependenciesComponentConfigurator.java b/src/main/java/com/technophobia/substeps/runner/IncludeProjectDependenciesComponentConfigurator.java index b8c8e7b..09f4162 100644 --- a/src/main/java/com/technophobia/substeps/runner/IncludeProjectDependenciesComponentConfigurator.java +++ b/src/main/java/com/technophobia/substeps/runner/IncludeProjectDependenciesComponentConfigurator.java @@ -60,13 +60,11 @@ public void configureComponent(final Object component, final PlexusConfiguration private void addProjectDependenciesToClassRealm(final ExpressionEvaluator expressionEvaluator, final ClassRealm containerRealm) throws ComponentConfigurationException { - List runtimeClasspathElements = null; List testClasspathElements = null; + try { // noinspection unchecked - runtimeClasspathElements = (List) expressionEvaluator - .evaluate("${project.runtimeClasspathElements}"); testClasspathElements = (List) expressionEvaluator .evaluate("${project.testClasspathElements}"); @@ -76,21 +74,15 @@ private void addProjectDependenciesToClassRealm(final ExpressionEvaluator expres "There was a problem evaluating: ${project.runtimeClasspathElements}", e); } - if (runtimeClasspathElements != null) { - // Add the project dependencies to the ClassRealm - final URL[] urls = buildURLs(runtimeClasspathElements); - for (final URL url : urls) { - containerRealm.addConstituent(url); - } - } - if (testClasspathElements != null) { // Add the project test dependencies to the ClassRealm final URL[] testUrls = buildURLs(testClasspathElements); for (final URL url : testUrls) { containerRealm.addConstituent(url); + } } + }