Merge branch 'BETA_JAVA8' into BETA_JAVA8_LUNA
Conflicts:
org.eclipse.jdt-feature/feature.xml
org.eclipse.jdt-feature/pom.xml
diff --git a/.gitignore b/.gitignore
index 57dbb71..8b3dc23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
heapdump.*
core.*
Snap.*
+# maven
+/*/target/
diff --git a/org.eclipse.jdt-feature/feature.xml b/org.eclipse.jdt-feature/feature.xml
index 7a01431..0743586 100644
--- a/org.eclipse.jdt-feature/feature.xml
+++ b/org.eclipse.jdt-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jdt"
label="%featureName"
- version="3.9.2.qualifier"
+ version="3.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -19,10 +19,6 @@
%license
</license>
- <requires>
- <import feature="org.eclipse.platform" version="3.8.0" match="greaterOrEqual"/>
- </requires>
-
<plugin
id="org.eclipse.jdt"
download-size="0"
diff --git a/org.eclipse.jdt-feature/pom.xml b/org.eclipse.jdt-feature/pom.xml
index f4f77fa..ef2aedd 100644
--- a/org.eclipse.jdt-feature/pom.xml
+++ b/org.eclipse.jdt-feature/pom.xml
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.jdt</artifactId>
<groupId>eclipse.jdt</groupId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt.feature</groupId>
<artifactId>org.eclipse.jdt</artifactId>
- <version>3.9.2-SNAPSHOT</version>
+ <version>3.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
@@ -42,6 +42,7 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tycho-extras.version}</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/org.eclipse.jdt-feature/sourceTemplatePlugin/about.html b/org.eclipse.jdt-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index c207d05..0000000
--- a/org.eclipse.jdt-feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>May 10, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt-feature/sourceTemplatePlugin/about.ini b/org.eclipse.jdt-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 5dfa1c0..0000000
--- a/org.eclipse.jdt-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/org.eclipse.jdt-feature/sourceTemplatePlugin/about.mappings b/org.eclipse.jdt-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/org.eclipse.jdt-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/org.eclipse.jdt-feature/sourceTemplatePlugin/about.properties b/org.eclipse.jdt-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 2f2f10c..0000000
--- a/org.eclipse.jdt-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2012 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Eclipse Java Development Tools SDK\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2000, 2012. All rights reserved.\n\
-Visit http://www.eclipse.org/jdt
-
diff --git a/org.eclipse.jdt-feature/sourceTemplatePlugin/build.properties b/org.eclipse.jdt-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index df97790..0000000
--- a/org.eclipse.jdt-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/org.eclipse.jdt-feature/sourceTemplatePlugin/eclipse32.gif b/org.eclipse.jdt-feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/org.eclipse.jdt-feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt-feature/sourceTemplatePlugin/eclipse32.png b/org.eclipse.jdt-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/org.eclipse.jdt-feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt/META-INF/MANIFEST.MF b/org.eclipse.jdt/META-INF/MANIFEST.MF
index c67f27c..d860e61 100644
--- a/org.eclipse.jdt/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt; singleton:=true
-Bundle-Version: 3.9.0.qualifier
+Bundle-Version: 3.10.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui.intro;bundle-version="[3.2.0,4.0.0)",
diff --git a/org.eclipse.jdt/about.mappings b/org.eclipse.jdt/about.mappings
index bddaab4..515397a 100644
--- a/org.eclipse.jdt/about.mappings
+++ b/org.eclipse.jdt/about.mappings
@@ -3,4 +3,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
diff --git a/org.eclipse.jdt/eclipse32.gif b/org.eclipse.jdt/eclipse32.gif
deleted file mode 100644
index 29edaa0..0000000
--- a/org.eclipse.jdt/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt/eclipse32.png b/org.eclipse.jdt/eclipse32.png
index 71ea8f9..bf85680 100644
--- a/org.eclipse.jdt/eclipse32.png
+++ b/org.eclipse.jdt/eclipse32.png
Binary files differ
diff --git a/org.eclipse.jdt/intro/css/migrate.css b/org.eclipse.jdt/intro/css/migrate.css
new file mode 100644
index 0000000..3e09692
--- /dev/null
+++ b/org.eclipse.jdt/intro/css/migrate.css
@@ -0,0 +1,2 @@
+a#java img { background-image : url(../../images/topiclabel/ov_javadev48.gif); }
+a#java:hover img { background-image : url(../../images/topiclabel/ov_javadev48_hov.gif); }
diff --git a/org.eclipse.jdt-feature/sourceTemplatePlugin/plugin.properties b/org.eclipse.jdt/intro/css/migrate.properties
similarity index 72%
rename from org.eclipse.jdt-feature/sourceTemplatePlugin/plugin.properties
rename to org.eclipse.jdt/intro/css/migrate.properties
index 66e17bd..c6a073e 100644
--- a/org.eclipse.jdt-feature/sourceTemplatePlugin/plugin.properties
+++ b/org.eclipse.jdt/intro/css/migrate.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2007 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-pluginName=Eclipse Java Development Tools SDK
-providerName=Eclipse.org
+migrate.java.link-icon = images/topiclabel/ov_javadev48.gif
+migrate.java.hover-icon = images/topiclabel/ov_javadev48_hov.gif
diff --git a/org.eclipse.jdt/intro/css/whatsnew.css b/org.eclipse.jdt/intro/css/whatsnew.css
index 8ca8f6e..672cf47 100644
--- a/org.eclipse.jdt/intro/css/whatsnew.css
+++ b/org.eclipse.jdt/intro/css/whatsnew.css
@@ -1,2 +1,2 @@
-a#jdt-noteworthy img { background-image : url(../../images/topiclabel/wn_javadevtools48.gif); }
-a#jdt-noteworthy:hover img { background-image : url(../../images/topiclabel/wn_javadevtools48_hov.gif); }
+a#jdt-noteworthy img { background-image : url(../../images/topiclabel/ov_javadev48.gif); }
+a#jdt-noteworthy:hover img { background-image : url(../../images/topiclabel/ov_javadev48_hov.gif); }
diff --git a/org.eclipse.jdt/intro/css/whatsnew.properties b/org.eclipse.jdt/intro/css/whatsnew.properties
index cebfaa9..6f0468d 100644
--- a/org.eclipse.jdt/intro/css/whatsnew.properties
+++ b/org.eclipse.jdt/intro/css/whatsnew.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
+# Copyright (c) 2007, 2014 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-whatsnew.jdt-noteworthy.link-icon = images/topiclabel/wn_javadevtools48.gif
-whatsnew.jdt-noteworthy.hover-icon = images/topiclabel/wn_javadevtools48_hov.gif
+whatsnew.jdt-noteworthy.link-icon = images/topiclabel/ov_javadev48.gif
+whatsnew.jdt-noteworthy.hover-icon = images/topiclabel/ov_javadev48_hov.gif
diff --git a/org.eclipse.jdt/intro/migrateExtensionContent.xml b/org.eclipse.jdt/intro/migrateExtensionContent.xml
new file mode 100644
index 0000000..e901ea4
--- /dev/null
+++ b/org.eclipse.jdt/intro/migrateExtensionContent.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<introContent>
+ <!-- Extension to the SDK Migration Page. -->
+ <extensionContent id="org.eclipse.jdt" name="Java development tools" alt-style="css/migrate.properties" style="css/migrate.css" path="migrate/@">
+ <group id="content-group" style-id="content-group">
+ <link style-id="content-link" label="Java development tools" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.jdt.doc.isv/porting/eclipse_4_4_porting_guide.html" id="java">
+ <text>Eclipse JDT Luna (4.4) Plug-in Migration Guide</text>
+ </link>
+ </group>
+ </extensionContent>
+</introContent>
diff --git a/org.eclipse.jdt/plugin.xml b/org.eclipse.jdt/plugin.xml
index 45eef7f..b490975 100644
--- a/org.eclipse.jdt/plugin.xml
+++ b/org.eclipse.jdt/plugin.xml
@@ -19,6 +19,10 @@
<configExtension
configId="org.eclipse.ui.intro.universalConfig"
content="$nl$/intro/whatsnewExtensionContent.xml"/>
+
+ <configExtension
+ configId="org.eclipse.ui.intro.universalConfig"
+ content="$nl$/intro/migrateExtensionContent.xml"/>
</extension>
<extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
diff --git a/org.eclipse.jdt/pom.xml b/org.eclipse.jdt/pom.xml
index 5258605..6680eb3 100644
--- a/org.eclipse.jdt/pom.xml
+++ b/org.eclipse.jdt/pom.xml
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.jdt</artifactId>
<groupId>eclipse.jdt</groupId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
@@ -33,30 +33,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>update-branding-plugins</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <replace file="about.mappings" token="@build@" value="${buildId}"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/pom.xml b/pom.xml
index a1037ee..dd0d054 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,13 +15,13 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
<groupId>eclipse.jdt</groupId>
<artifactId>eclipse.jdt</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
