Merge branch 'BETA_JAVA8' into BETA_JAVA8_LUNA
Conflicts:
org.eclipse.jdt-feature/feature.xml
org.eclipse.jdt-feature/pom.xml
diff --git a/org.eclipse.jdt-feature/feature.xml b/org.eclipse.jdt-feature/feature.xml
index 6acede7..0743586 100644
--- a/org.eclipse.jdt-feature/feature.xml
+++ b/org.eclipse.jdt-feature/feature.xml
@@ -81,7 +81,14 @@
id="org.eclipse.jdt.annotation"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.1.0.qualifier"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jdt.annotation"
+ download-size="0"
+ install-size="0"
+ version="2.0.0.qualifier"
unpack="false"/>
<plugin
diff --git a/org.eclipse.jdt-feature/pom.xml b/org.eclipse.jdt-feature/pom.xml
index 9f4b55b..ef2aedd 100644
--- a/org.eclipse.jdt-feature/pom.xml
+++ b/org.eclipse.jdt-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ Copyright (c) 2012, 2014 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
