diff options
| author | Jay Arthanareeswaran | 2017-05-22 10:00:43 +0000 |
|---|---|---|
| committer | Jay Arthanareeswaran | 2017-05-22 10:59:09 +0000 |
| commit | cf1a35ef6ef9f64528efd8acdfaee1132412e665 (patch) | |
| tree | 8081713c8fe49438be420bbc7187234f1d5a684c /org.eclipse.jdt.core.tests.performance | |
| parent | 7642a2d4343932d4cf7e487984926d928e114617 (diff) | |
| parent | 34337e2078da6ee9eff6d9ed3144e9836eec04f2 (diff) | |
| download | eclipse.jdt.core-cf1a35ef6ef9f64528efd8acdfaee1132412e665.tar.gz eclipse.jdt.core-cf1a35ef6ef9f64528efd8acdfaee1132412e665.tar.xz eclipse.jdt.core-cf1a35ef6ef9f64528efd8acdfaee1132412e665.zip | |
Merge branch 'master' into BETA_JAVA9Y20170523-0000P20170523-0000
# Conflicts:
# org.eclipse.jdt.core.tests.compiler/src/EvalTestsTarget.zip
# org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java
# org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java
# org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NamedMember.java
Change-Id: Ica9e9ccc4ff370554100c545310fba1c66adeed2
Diffstat (limited to 'org.eclipse.jdt.core.tests.performance')
| -rw-r--r-- | org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | org.eclipse.jdt.core.tests.performance/pom.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF index 6d33669ab6..58a7973a9a 100644 --- a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.performance -Bundle-Version: 3.10.0.qualifier +Bundle-Version: 3.10.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.jdt.core.tests.performance, diff --git a/org.eclipse.jdt.core.tests.performance/pom.xml b/org.eclipse.jdt.core.tests.performance/pom.xml index 40fbdbb7e8..0db10c8b01 100644 --- a/org.eclipse.jdt.core.tests.performance/pom.xml +++ b/org.eclipse.jdt.core.tests.performance/pom.xml @@ -20,7 +20,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.core.tests.performance</artifactId> - <version>3.10.0-SNAPSHOT</version> + <version>3.10.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> <testSuite>${project.artifactId}</testSuite> |