Author: veithen
Date: Wed Dec 28 10:42:28 2016
New Revision: 1776260
URL: http://svn.apache.org/viewvc?rev=1776260&view=rev
Log:
Update Maven dependencies to 3.0 to fix a weird compilation failure (related to
raw types) that seems to occur only on Java 8.
Modified:
synapse/trunk/java/modules/xar-maven-plugin/pom.xml
synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/xar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/xar-maven-plugin/pom.xml?rev=1776260&r1=1776259&r2=1776260&view=diff
==============================================================================
--- synapse/trunk/java/modules/xar-maven-plugin/pom.xml (original)
+++ synapse/trunk/java/modules/xar-maven-plugin/pom.xml Wed Dec 28 10:42:28 2016
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -54,6 +54,10 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
</dependency>
<dependency>
Modified:
synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java?rev=1776260&r1=1776259&r2=1776260&view=diff
==============================================================================
---
synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
(original)
+++
synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
Wed Dec 28 10:42:28 2016
@@ -43,6 +43,7 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.DebugResolutionListener;
+import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
@@ -358,15 +359,10 @@ public abstract class AbstractXarMojo ex
logArtifacts(synapseRuntimeDeps);
log.debug("Resolving transitive dependencies for " + synapseCore + "
...");
- try {
- synapseRuntimeDeps = artifactCollector.collect(synapseRuntimeDeps,
- synapseCoreProject.getArtifact(),
synapseCoreProject.getManagedVersionMap(),
- localRepository, remoteArtifactRepositories,
artifactMetadataSource, null,
- Collections.singletonList(new
DebugResolutionListener(logger))).getArtifacts();
- } catch (ArtifactResolutionException e) {
- throw new MojoExecutionException("Unable to resolve transitive
dependencies for "
- + synapseCore);
- }
+ synapseRuntimeDeps = artifactCollector.collect(synapseRuntimeDeps,
+ synapseCoreProject.getArtifact(),
synapseCoreProject.getManagedVersionMap(),
+ localRepository, remoteArtifactRepositories,
artifactMetadataSource, null,
+ Collections.<ResolutionListener>singletonList(new
DebugResolutionListener(logger))).getArtifacts();
log.debug("All runtime dependencies for " + synapseCore + " :");
logArtifacts(synapseRuntimeDeps);
Modified: synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=1776260&r1=1776259&r2=1776260&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Wed Dec 28 10:42:28 2016
@@ -840,13 +840,18 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${maven.artifact.version}</version>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -1105,8 +1110,7 @@
<activation.version>1.1</activation.version>
<!-- Maven Tools -->
- <maven.version>2.0.7</maven.version>
- <maven.artifact.version>2.0.8</maven.artifact.version>
+ <maven.version>3.0</maven.version>
<maven.archiver.version>2.2</maven.archiver.version>
<plexus.utils.version>1.5.4</plexus.utils.version>
</properties>
