Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update m2e to 1.9.1 #762

Merged
merged 1 commit into from
Aug 23, 2018
Merged

Update m2e to 1.9.1 #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<repository location="http://download.eclipse.org/buildship/updates/e47/releases/2.x/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.m2e.feature.feature.group" version="1.9.0.20180606-2036"/>
<repository location="http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180606-2036/"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.9.1.20180823-0040"/>
<repository location="http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.1.20180823-0040"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
Expand Down
26 changes: 26 additions & 0 deletions org.eclipse.jdt.ls.tests/projects/maven/salut-java10/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>foo.bar</groupId>
<artifactId>salut-java10</artifactId>
<version>0.0.1-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>10</source>
<target>10</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
</dependencies>
</project>
22 changes: 22 additions & 0 deletions org.eclipse.jdt.ls.tests/projects/maven/salut-java10/src/main/java/org/sample/Bar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.sample;

/**
* This is Bar
*/
public class Bar {

public static void main(String[] args) {
var foo = "Hello world! from "+Bar.class;
System.out.print( foo );
}

public static interface MyInterface {

void foo();
}

public static class MyClass {

void bar() {}
}
}
26 changes: 26 additions & 0 deletions org.eclipse.jdt.ls.tests/projects/maven/salut-java110/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>foo.bar</groupId>
<artifactId>salut-java110</artifactId>
<version>0.0.1-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.10</source>
<target>1.10</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
</dependencies>
</project>
22 changes: 22 additions & 0 deletions org.eclipse.jdt.ls.tests/projects/maven/salut-java110/src/main/java/org/sample/Bar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.sample;

/**
* This is Bar
*/
public class Bar {

public static void main(String[] args) {
var foo = "Hello world! from "+Bar.class;
System.out.print( foo );
}

public static interface MyInterface {

void foo();
}

public static class MyClass {

void bar() {}
}
}
16 changes: 16 additions & 0 deletions ....jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/MavenProjectImporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,22 @@ public void testJava9Project() throws Exception {
assertNoErrors(project);
}

@Test
public void testJava110Project() throws Exception {
IProject project = importMavenProject("salut-java110");
assertIsJavaProject(project);
assertEquals("10", getJavaSourceLevel(project));
assertNoErrors(project);
}

@Test
public void testJava10Project() throws Exception {
IProject project = importMavenProject("salut-java10");
assertIsJavaProject(project);
assertEquals("10", getJavaSourceLevel(project));
assertNoErrors(project);
}

@Test
public void testAnnotationProcessing() throws Exception {
IProject project = importMavenProject("autovalued");
Expand Down