Hi Lennart,
Why 3.0.4? This version has a security issue[1] fixed in 3.0.5 (it is
actually the only fix in 3.0.5).
And it is probably easier to say the plugin is Maven3 compatible, which
implies at least Maven 3.0.
Is there a specific interface change in 3.0.4 you depend on?
thanks,
Robert
[1] http://maven.apache.org/security.html
Op Fri, 06 Feb 2015 05:44:13 +0100 schreef <lenna...@codehaus.org>:
Revision:
20398
Author:
lennartj
Date:
2015-02-05 22:44:12 -0600 (Thu, 05 Feb 2015)
Log Message
Assigned Maven 3.0.4 as minimum Maven version for the jaxb2-maven-plugin.
Modified Paths
trunk/mojo/jaxb2-maven-plugin/pom.xml
trunk/mojo/jaxb2-maven-plugin/src/test/java/org/codehaus/mojo/jaxb2/junit/PlexusContainerRule.java
Diff
Modified: trunk/mojo/jaxb2-maven-plugin/pom.xml (20397 => 20398)
--- trunk/mojo/jaxb2-maven-plugin/pom.xml 2015-02-05 21:54:17 UTC (rev
20397)
+++ trunk/mojo/jaxb2-maven-plugin/pom.xml 2015-02-06 04:44:12 UTC (rev
20398)
@@ -101,11 +101,11 @@
<properties>
<!-- Define Maven and JDK versions-->
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0.4</mavenVersion>
<mojo.java.target>1.6</mojo.java.target>
<!-- Plexus component versions -->
- <plexus-compiler-api.version>2.4</plexus-compiler-api.version>
+ <plexus-compiler-api.version>2.5</plexus-compiler-api.version>
<plexus-utils.version>3.0.21</plexus-utils.version>
<plexus-build-api.version>0.0.7</plexus-build-api.version>
@@ -199,11 +199,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
</dependency>
Modified:
trunk/mojo/jaxb2-maven-plugin/src/test/java/org/codehaus/mojo/jaxb2/junit/PlexusContainerRule.java
(20397 => 20398)
---
trunk/mojo/jaxb2-maven-plugin/src/test/java/org/codehaus/mojo/jaxb2/junit/PlexusContainerRule.java
2015-02-05 21:54:17 UTC (rev 20397)
+++
trunk/mojo/jaxb2-maven-plugin/src/test/java/org/codehaus/mojo/jaxb2/junit/PlexusContainerRule.java
2015-02-06 04:44:12 UTC (rev 20398)
@@ -2,13 +2,14 @@
import org.codehaus.mojo.jaxb2.shared.FileSystemUtilities;
import org.codehaus.mojo.jaxb2.shared.Validate;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.context.Context;
import org.junit.runner.Description;
import java.io.File;
-import java.io.InputStreamReader;
import java.net.URL;
/**
@@ -33,6 +34,7 @@
// Internal state
private PlexusContainer container;
+ private ContainerConfiguration config;
private URL configurationURL;
/**
@@ -94,10 +96,16 @@
final Class<?> testClass = description.getTestClass();
Validate.notNull(testClass, "Cannot handle null
'description.getTestClass()' value.");
- // Create and configure the Container
- container = new DefaultPlexusContainer();
- container.addContextValue(BASEDIR, getBasedir());
+ // Configure and create the Container
+ final URL configURL = this.configurationURL == null
+ ? getDefaultConfigurationURL(testClass)
+ : this.configurationURL;
+ config = new DefaultContainerConfiguration();
+ config.setContainerConfigurationURL(configURL);
+ container = new DefaultPlexusContainer(config);
+ container.getContext().put(BASEDIR, getBasedir());
+
// Configure the Plexus context
final Context context = container.getContext();
if (!context.contains(PLEXUS_HOME)) {
@@ -109,16 +117,9 @@
context.put(PLEXUS_HOME, plexusHomeDir.getAbsolutePath());
}
- final URL configURL = this.configurationURL == null
- ? getDefaultConfigurationURL(testClass)
- : this.configurationURL;
- if (configURL != null) {
- container.setConfigurationResource(new
InputStreamReader(configURL.openStream()));
- }
-
// Initialize and start the Plexus Container.
- container.initialize();
- container.start();
+ // container.initialize();
+ // container.start();
}
/**
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email
---------------------------------------------------------------------
To unsubscribe from this list, please visit:
http://xircles.codehaus.org/manage_email
