Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Bricon2015-05-05 13:28:17 -0400
committerFred Bricon2015-05-05 13:28:17 -0400
commit2bb944d9038e262d483d2b938292997b7da6288c (patch)
tree03b7fe61ca5aee6a80d6f73cca04ccecad385231
parent168ae1ecdb5c2b0b2a0052e66b3fb90b832c7a69 (diff)
downloadm2e-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.xml10
-rw-r--r--org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java6
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>&lt;plugin&gt;
&lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
&lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
- &lt;version&gt;3.2&lt;/version&gt;
+ &lt;version&gt;3.3&lt;/version&gt;
&lt;configuration&gt;
&lt;!-- http://maven.apache.org/plugins/maven-compiler-plugin/ --&gt;
- &lt;source&gt;${cursor}1.7&lt;/source&gt;
- &lt;target&gt;1.7&lt;/target&gt;
+ &lt;source&gt;${cursor}1.8&lt;/source&gt;
+ &lt;target&gt;1.8&lt;/target&gt;
&lt;/configuration&gt;
&lt;/plugin&gt;</pattern>
</template>
@@ -243,7 +243,7 @@
&lt;version&gt;2.5&lt;/version&gt;
&lt;configuration&gt;
&lt;!-- http://maven.apache.org/plugins/maven-ejb-plugin/ --&gt;
- &lt;ejbVersion&gt;3.0${cursor}&lt;/ejbVersion&gt;
+ &lt;ejbVersion&gt;3.1${cursor}&lt;/ejbVersion&gt;
&lt;/configuration&gt;
&lt;/plugin&gt;</pattern>
</template>
@@ -292,7 +292,7 @@
<pattern>&lt;plugin&gt;
&lt;groupId&gt;org.eclipse.jetty&lt;/groupId&gt;
&lt;artifactId&gt;jetty-maven-plugin&lt;/artifactId&gt;
- &lt;version&gt;${cursor}9.2.7.v20150116&lt;/version&gt;
+ &lt;version&gt;${cursor}9.2.10.v20150310&lt;/version&gt;
&lt;configuration&gt;
&lt;!-- http://www.eclipse.org/jetty/documentation/current/jetty-maven-plugin.html --&gt;
&lt;scanIntervalSeconds&gt;3&lt;/scanIntervalSeconds&gt;
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))) {

Back to the top