diff options
author | Jay Arthanareeswaran | 2017-09-26 05:12:23 +0000 |
---|---|---|
committer | Jay Arthanareeswaran | 2017-09-26 05:12:23 +0000 |
commit | 6e12fb6ec6e1d5f33bccd05064d28125c2b11ca2 (patch) | |
tree | b13fa9d1c9ed255ba38d91da4dfa91c72c27ea71 /pom.xml | |
parent | 0a908cd3dc3279066d94660987f6e5450b72486e (diff) | |
parent | e3cdffd4f3b18ecae4adb6ba136baca629984afc (diff) | |
download | eclipse.jdt.core-6e12fb6ec6e1d5f33bccd05064d28125c2b11ca2.tar.gz eclipse.jdt.core-6e12fb6ec6e1d5f33bccd05064d28125c2b11ca2.tar.xz eclipse.jdt.core-6e12fb6ec6e1d5f33bccd05064d28125c2b11ca2.zip |
Merge remote-tracking branch 'origin/BETA_JAVA9'
# Conflicts:
# org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompilerImpl.java
# org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
# org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileSystem.java
# org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/Util.java
# org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
Change-Id: Id40b6810011281c7f3d334b53b5e54168ebbc57f
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -25,6 +25,7 @@ <packaging>pom</packaging> <properties> + <cbi-jdt-version>3.14.0.v20170830-0152</cbi-jdt-version> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git</tycho.scmUrl> </properties> |