Skip to content

Commit 326282b

Browse files
committed
Merge commit '93733e28b60972353b81a5918ecf045ff172d199' into master-gme
# Conflicts: # README.md # packages/org.eclipse.epp.package.cpp/plugin.xml # releng/org.eclipse.epp.config/parent/pom.xml
2 parents 23f2ab0 + 93733e2 commit 326282b

File tree

221 files changed

+403
-420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+403
-420
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ Additional Configuration Possibilities
8484
--------------------------------------
8585

8686
By default, the EPP build uses the content of the Eclipse Simultaneous Release *Staging*
87-
repository at <http://download.eclipse.org/staging/2018-12/> as input. Sometimes it is
87+
repository at <http://download.eclipse.org/staging/2019-03/> as input. Sometimes it is
8888
desired to build against another release (e.g. a different milestone), or against a local
8989
mirror of this repository. This can be achieved by setting the Java property
9090
`eclipse.simultaneous.release.repository`to another URL. As an example, by adding the
9191
following argument to the Maven command line, the EPP build will read its input from the
92-
composite Eclipse 2018-12 repository:
92+
composite Eclipse 2019-03 repository:
9393

94-
-Declipse.simultaneous.release.repository="http://download.eclipse.org/releases/2018-12"
94+
-Declipse.simultaneous.release.repository="http://download.eclipse.org/releases/2019-03"
9595

9696
Changes from Eclipse version
9797
----------------------------
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181214-0600
1+
20190314-1200

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Click <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit">here</a
2929
</packageMetaData>
3030
<MoreInfo>
3131
<NewAndNoteworthy
32-
url="https://www.eclipse.org/eclipse/news/4.8/"
32+
url="https://www.eclipse.org/eclipse/news/4.11/"
3333
project="Eclipse Platform" />
3434
<NewAndNoteworthy
3535
url="https://wiki.eclipse.org/EGit/New_and_Noteworthy/5.0"
@@ -38,9 +38,9 @@ Click <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit">here</a
3838

3939
<!-- version, the RCP version to build. This is used to determine the file
4040
name of the root file archives -->
41-
<rcp version="4.10.0" />
41+
<rcp version="4.11.0" />
4242

4343
<!-- name, the name of the product, used in naming the created files. -->
44-
<product name="eclipse-committers-2018-12-R" />
44+
<product name="eclipse-committers-2019-03-R" />
4545

4646
</configuration>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
################################################################################
2-
# Copyright (c) 2007, 2018 Eclipse contributors and others.
2+
# Copyright (c) 2007, 2019 Eclipse contributors and others.
33
# All rights reserved. This program and the accompanying materials
44
# are made available under the terms of the Eclipse Public License v1.0
55
# which accompanies this distribution, and is available at
@@ -14,7 +14,7 @@ description = \
1414
The Eclipse Platform, and all the tools needed to develop and debug it: Java and Plug-in Development Tooling, Git and CVS support, including source and developer documentation.
1515

1616
copyright = \
17-
Copyright (c) 2007, 2018 Eclipse contributors and others.\n\
17+
Copyright (c) 2007, 2019 Eclipse contributors and others.\n\
1818
All rights reserved. This program and the accompanying materials\n\
1919
are made available under the terms of the Eclipse Public License v1.0\n\
2020
which accompanies this distribution, and is available at\n\

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.epp.package.committers.feature"
44
label="EPP Eclipse IDE for Eclipse Committers Feature"
5-
version="4.10.0.qualifier"
5+
version="4.11.0.qualifier"
66
provider-name="Eclipse Packaging Project"
77
plugin="org.eclipse.epp.package.committers"
88
license-feature="org.eclipse.license"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2012, 2018 Eclipse Foundation and others.
3+
Copyright (c) 2012, 2019 Eclipse Foundation and others.
44
All rights reserved. This program and the accompanying materials
55
are made available under the terms of the Eclipse Distribution License v1.0
66
which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.eclipse.epp</groupId>
2323
<artifactId>org.eclipse.epp-feature-parent</artifactId>
24-
<version>4.10.0-SNAPSHOT</version>
24+
<version>4.11.0-SNAPSHOT</version>
2525
<relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
2626
</parent>
2727

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181214-0600
1+
20190314-1200

packages/org.eclipse.epp.package.committers.product/epp.product

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Eclipse IDE for Eclipse Committers" uid="epp.package.committers" id="org.eclipse.epp.package.committers.product" application="org.eclipse.ui.ide.workbench" version="4.10.0.qualifier" useFeatures="true" includeLaunchers="true">
4+
<product name="Eclipse IDE for Eclipse Committers" uid="epp.package.committers" id="org.eclipse.epp.package.committers.product" application="org.eclipse.ui.ide.workbench" version="4.11.0.qualifier" useFeatures="true" includeLaunchers="true">
55

66
<aboutInfo>
77
<image path="/org.eclipse.epp.package.committers/eclipse_lg.png"/>
@@ -191,9 +191,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
191191
</plugins>
192192

193193
<features>
194-
<feature id="org.eclipse.epp.package.committers.feature" version="4.10.0.qualifier"/>
195-
<feature id="org.eclipse.epp.package.common.feature" version="4.10.0.qualifier"/>
196-
<feature id="org.eclipse.platform" version="4.10.0.qualifier"/>
194+
<feature id="org.eclipse.epp.package.committers.feature" version="4.11.0.qualifier"/>
195+
<feature id="org.eclipse.epp.package.common.feature" version="4.11.0.qualifier"/>
196+
<feature id="org.eclipse.platform" version="4.11.0.qualifier"/>
197197
<feature id="org.eclipse.epp.mpc" installMode="root"/>
198198

199199
<feature id="org.eclipse.equinox.p2.user.ui"/>

packages/org.eclipse.epp.package.committers.product/p2.inf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
55
properties.0.value = true
66

77
properties.1.name = org.eclipse.equinox.p2.description
8-
properties.1.value = 2018-12 Release of the Eclipse Committers package.
8+
properties.1.value = 2019-03 Release of the Eclipse Committers package.
99

1010
properties.2.name = org.eclipse.equinox.p2.provider
1111
properties.2.value = Eclipse Packaging Project

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2012, 2018 Eclipse Foundation and others.
3+
Copyright (c) 2012, 2019 Eclipse Foundation and others.
44
All rights reserved. This program and the accompanying materials
55
are made available under the terms of the Eclipse Distribution License v1.0
66
which accompanies this distribution, and is available at
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.eclipse.epp</groupId>
2222
<artifactId>org.eclipse.epp-product-parent</artifactId>
23-
<version>4.10.0-SNAPSHOT</version>
23+
<version>4.11.0-SNAPSHOT</version>
2424
<relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
2525
</parent>
2626

0 commit comments

Comments
 (0)