Merge branch 'master' into master-gme

# Conflicts:
#	README.md
#	releng/org.eclipse.epp.config/parent/pom.xml

Author: ilg-ul

README.md

@@ -84,14 +84,14 @@ Additional Configuration Possibilities
 --------------------------------------
 
 By default, the EPP build uses the content of the Eclipse Simultaneous Release *Staging*
-repository at <http://download.eclipse.org/staging/2019-06/> as input. Sometimes it is
+repository at <http://download.eclipse.org/staging/2019-09/> as input. Sometimes it is
 desired to build against another release (e.g. a different milestone), or against a local
 mirror of this repository. This can be achieved by setting the Java property
 `eclipse.simultaneous.release.repository`to another URL. As an example, by adding the
 following argument to the Maven command line, the EPP build will read its input from the
-composite Eclipse 2019-06 repository:
+composite Eclipse 2019-09 repository:
 
-    -Declipse.simultaneous.release.repository="http://download.eclipse.org/releases/2019-06"
+    -Declipse.simultaneous.release.repository="http://download.eclipse.org/releases/2019-09"
 
 Changes from Eclipse version
 ----------------------------

packages/org.eclipse.epp.package.committers.feature/.forceQualifierUpdate

@@ -1 +1 @@
-20190614-1200
+20190917-0000

packages/org.eclipse.epp.package.committers.feature/build.properties

@@ -1,5 +1,4 @@
 bin.includes = feature.xml,\
                p2.inf,\
-               epl-v10.html,\
                feature.properties
 includeLaunchers = false

packages/org.eclipse.epp.package.committers.feature/epl-v10.html

@@ -29,18 +29,18 @@ Click <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit">here</a
   </packageMetaData>
   <MoreInfo>
   <NewAndNoteworthy
-    url="https://www.eclipse.org/eclipse/news/4.12/"
+    url="https://www.eclipse.org/eclipse/news/4.13/"
     project="Eclipse Platform" />
   <NewAndNoteworthy
-    url="https://wiki.eclipse.org/EGit/New_and_Noteworthy/5.4"
+    url="https://wiki.eclipse.org/EGit/New_and_Noteworthy/5.5"
     project="Eclipse EGit" />
   </MoreInfo>
 
   <!-- version, the RCP version to build. This is used to determine the file
     name of the root file archives -->
-  <rcp version="4.12.0" />
+  <rcp version="4.13.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-2019-06-R" />
+  <product name="eclipse-committers-2019-09-R" />
 
 </configuration>

packages/org.eclipse.epp.package.committers.feature/epp.website.xml

@@ -1,9 +1,9 @@
 ################################################################################
 # Copyright (c) 2007, 2019 Eclipse contributors and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #    Innoopract Informationssysteme GmbH - initial API and implementation
@@ -16,9 +16,9 @@ The Eclipse Platform, and all the tools needed to develop and debug it: Java and
 copyright = \
 Copyright (c) 2007, 2019 Eclipse contributors and others.\n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License v2.0\n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+http://www.eclipse.org/legal/epl-v20.html\n\
 \n\
 Contributors:\n\
    Innoopract Informationssysteme GmbH - initial API and implementation\n\

packages/org.eclipse.epp.package.committers.feature/feature.properties

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.committers.feature"
       label="EPP Eclipse IDE for Eclipse Committers Feature"
-      version="4.12.0.qualifier"
+      version="4.13.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.committers"
       license-feature="org.eclipse.license"

packages/org.eclipse.epp.package.committers.feature/feature.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-feature-parent</artifactId>
-    <version>4.12.0-SNAPSHOT</version>
+    <version>4.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 

packages/org.eclipse.epp.package.committers.feature/pom.xml

@@ -1 +1 @@
-20190614-1200
+20190917-0000