Author: khmarbaise
Date: Thu Oct 1 16:01:49 2015
New Revision: 1706279
URL: http://svn.apache.org/viewvc?rev=1706279&view=rev
Log:
[MSHARED-439] Upgrade to Maven 3.0 dependencies and JDK6
Changed to use maven-core for toolchain.
Modified:
maven/shared/trunk/maven-shared-utils/pom.xml
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1706279&r1=1706278&r2=1706279&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Thu Oct 1 16:01:49 2015
@@ -92,12 +92,11 @@
<artifactId>jsr305</artifactId>
<version>2.0.1</version>
</dependency>
- <!-- used for the javatool api -->
+ <!-- used for the ToolChain api -->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-toolchain</artifactId>
- <version>2.2.1</version>
- <scope>provided</scope>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java?rev=1706279&r1=1706278&r2=1706279&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
Thu Oct 1 16:01:49 2015
@@ -24,10 +24,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
* @author <a href="mailto:[email protected]">Jason van Zyl</a>