diff options
author | Fred Bricon | 2015-05-05 17:28:17 +0000 |
---|---|---|
committer | Fred Bricon | 2015-05-05 17:28:17 +0000 |
commit | 2bb944d9038e262d483d2b938292997b7da6288c (patch) | |
tree | 03b7fe61ca5aee6a80d6f73cca04ccecad385231 | |
parent | 168ae1ecdb5c2b0b2a0052e66b3fb90b832c7a69 (diff) | |
download | m2e-core-2bb944d9038e262d483d2b938292997b7da6288c.tar.gz m2e-core-2bb944d9038e262d483d2b938292997b7da6288c.tar.xz m2e-core-2bb944d9038e262d483d2b938292997b7da6288c.zip |
Update various plugin versions
Change-Id: I3d384292ac8e769c6d595979b95d1fa9ff181732
Signed-off-by: Fred Bricon <fbricon@gmail.com>
-rw-r--r-- | org.eclipse.m2e.editor.xml/plugin.xml | 10 | ||||
-rw-r--r-- | org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/org.eclipse.m2e.editor.xml/plugin.xml b/org.eclipse.m2e.editor.xml/plugin.xml index 872a64f2..17ecab89 100644 --- a/org.eclipse.m2e.editor.xml/plugin.xml +++ b/org.eclipse.m2e.editor.xml/plugin.xml @@ -180,11 +180,11 @@ <pattern><plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> + <version>3.3</version> <configuration> <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ --> - <source>${cursor}1.7</source> - <target>1.7</target> + <source>${cursor}1.8</source> + <target>1.8</target> </configuration> </plugin></pattern> </template> @@ -243,7 +243,7 @@ <version>2.5</version> <configuration> <!-- http://maven.apache.org/plugins/maven-ejb-plugin/ --> - <ejbVersion>3.0${cursor}</ejbVersion> + <ejbVersion>3.1${cursor}</ejbVersion> </configuration> </plugin></pattern> </template> @@ -292,7 +292,7 @@ <pattern><plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>${cursor}9.2.7.v20150116</version> + <version>${cursor}9.2.10.v20150310</version> <configuration> <!-- http://www.eclipse.org/jetty/documentation/current/jetty-maven-plugin.html --> <scanIntervalSeconds>3</scanIntervalSeconds> diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java index 8f84cf0c..6e87e824 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java @@ -80,7 +80,7 @@ public class JavaProjectConversionParticipant extends AbstractProjectConversionP private static final String COMPILER_ARTIFACT_ID = "maven-compiler-plugin"; //$NON-NLS-1$ - private static final String DEFAULT_COMPILER_VERSION = "3.1"; //$NON-NLS-1$ + private static final String DEFAULT_COMPILER_VERSION = "3.3"; //$NON-NLS-1$ private static final String TARGET_KEY = "target"; //$NON-NLS-1$ @@ -403,8 +403,8 @@ public class JavaProjectConversionParticipant extends AbstractProjectConversionP Map<String, IndexedArtifact> values = index.search(a, IIndex.SEARCH_PLUGIN); if(!values.isEmpty()) { SortedSet<ComparableVersion> versions = new TreeSet<ComparableVersion>(); - ComparableVersion referenceComparableVersion = referenceVersion == null ? null : new ComparableVersion( - referenceVersion); + ComparableVersion referenceComparableVersion = referenceVersion == null ? null + : new ComparableVersion(referenceVersion); for(Map.Entry<String, IndexedArtifact> e : values.entrySet()) { if(!(e.getKey().endsWith(partialKey))) { |