Skip to content

Commit

Permalink
dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Ian Moore committed Jul 4, 2012
1 parent 8d28bf1 commit 8dd94bd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 31 deletions.
28 changes: 8 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<hamcrest.version>1.3.RC2</hamcrest.version>
<guava.version>10.0</guava.version>
<mockito.version>1.9.0-rc1</mockito.version>
<substeps.version>0.0.5-SNAPSHOT</substeps.version>
<substeps.version>0.0.5</substeps.version>
<maven.version>2.2.1</maven.version>


Expand Down Expand Up @@ -127,21 +127,25 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -177,30 +181,17 @@
<scope>test</scope>
</dependency>


<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>

</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito.version}</version>
</dependency>

<dependency>
<dependency>
<groupId>com.technophobia.substeps</groupId>
<artifactId>substeps-core</artifactId>
<version>${substeps.version}</version>

</dependency>

</dependencies>
Expand Down Expand Up @@ -232,8 +223,5 @@
<developerConnection>${substeps-runner.scm}</developerConnection>
<url>${substeps-runner.scm.url}</url>
</scm>

<!-- TODO define in props -->



</project>
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,11 @@ public void configureComponent(final Object component, final PlexusConfiguration

private void addProjectDependenciesToClassRealm(final ExpressionEvaluator expressionEvaluator,
final ClassRealm containerRealm) throws ComponentConfigurationException {
List<String> runtimeClasspathElements = null;

List<String> testClasspathElements = null;

try {
// noinspection unchecked
runtimeClasspathElements = (List<String>) expressionEvaluator
.evaluate("${project.runtimeClasspathElements}");

testClasspathElements = (List<String>) expressionEvaluator
.evaluate("${project.testClasspathElements}");
Expand All @@ -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);

}
}

}


Expand Down

0 comments on commit 8dd94bd

Please sign in to comment.