Skip to content

Commit

Permalink
[releng] Prepare repo for 2021-06 M1
Browse files Browse the repository at this point in the history
Change-Id: I40a1c77021fe13071519c25485dbcdb5ae3437f9
  • Loading branch information
jonahgraham committed Mar 29, 2021
1 parent 15645f5 commit 19bd3df
Show file tree
Hide file tree
Showing 103 changed files with 138 additions and 137 deletions.
2 changes: 1 addition & 1 deletion RELEASING.md
Expand Up @@ -51,7 +51,7 @@ EPP releases happen for each milestone and release candidate according to the [E
- [ ] Help -> About says expected build name and milestone, e.g. `2020-03-M2`
- [ ] `org.eclipse.epp.package.*` features and bundles have the timestamp of the forced qualifier update or later
- [ ] Upgrade from previous release works. To test the upgrade an equivalent to the simrel release composite site needs to done. Add the following software sites to available software, check for updates and then make sure stuff works. In particular check error log and that core features (Such as JDT, Platform) have been upgraded.
- `https://download.eclipse.org/staging/2021-03/`
- `https://download.eclipse.org/staging/2021-06/`
- `https://download.eclipse.org/technology/epp/staging/repository/`
- [ ] Verify no non-EPP content is in the p2 repo (especially justj, update [remove-justj-from-p2.xml](https://git.eclipse.org/c/epp/org.eclipse.epp.packages.git/tree/releng/org.eclipse.epp.config/tools/remove-justj-from-p2.xml) if needed)
- [ ] Edit the Jenkins build
Expand Down
2 changes: 1 addition & 1 deletion archive-template/pom.xml
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../releng/org.eclipse.epp.config/parent</relativePath>
</parent>

Expand Down
Expand Up @@ -29,14 +29,14 @@ 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.19/"
url="https://www.eclipse.org/eclipse/news/4.20/"
project="Eclipse Platform" />
<NewAndNoteworthy
url="https://wiki.eclipse.org/EGit/New_and_Noteworthy/5.11"
project="Eclipse EGit" />
</MoreInfo>

<!-- name, the name of the product, used in naming the created files. -->
<product name="eclipse-committers-2021-03-R" />
<product name="eclipse-committers-2021-06-M1" />

</configuration>
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.package.committers.feature"
label="EPP Eclipse IDE for Eclipse Committers Feature"
version="4.19.0.qualifier"
version="4.20.0.qualifier"
provider-name="Eclipse Packaging Project"
plugin="org.eclipse.epp.package.committers"
license-feature="org.eclipse.license"
Expand Down
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-feature-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
</parent>

Expand Down
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<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.19.0.qualifier" useFeatures="true" includeLaunchers="true">
<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.20.0.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="/org.eclipse.epp.package.committers/eclipse_lg.png"/>
Expand Down Expand Up @@ -203,8 +203,8 @@ United States, other countries, or both.
</plugins>

<features>
<feature id="org.eclipse.epp.package.committers.feature" version="4.19.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.19.0.qualifier"/>
<feature id="org.eclipse.epp.package.committers.feature" version="4.20.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.20.0.qualifier"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.epp.mpc" installMode="root"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.committers.product/p2.inf
Expand Up @@ -5,7 +5,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true

properties.1.name = org.eclipse.equinox.p2.description
properties.1.value = 2021-03 Release of the Eclipse Committers package.
properties.1.value = 2021-06 Release of the Eclipse Committers package.

properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse Packaging Project
Expand Down
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>

Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.epp.package.committers;singleton:=true
Bundle-Version: 4.19.0.qualifier
Bundle-Version: 4.20.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.committers/pom.xml
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-bundle-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
</parent>

Expand Down
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.package.common.feature"
label="Eclipse Packaging Project Common Feature"
version="4.19.0.qualifier"
version="4.20.0.qualifier"
provider-name="Eclipse Packaging Project"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.common.feature/pom.xml
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-feature-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
</parent>

Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common EPP Bundle
Bundle-SymbolicName: org.eclipse.epp.package.common;singleton:=true
Bundle-Version: 4.19.0.qualifier
Bundle-Version: 4.20.0.qualifier
Bundle-Vendor: Eclipse Packaging Project
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.platform,
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.common/pom.xml
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-bundle-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
</parent>

Expand Down
Expand Up @@ -22,6 +22,6 @@
</packageMetaData>

<!-- name, the name of the product, used in naming the created files. -->
<product name="eclipse-cpp-2021-03-R" />
<product name="eclipse-cpp-2021-06-M1" />

</configuration>
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.cpp.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.package.cpp.feature"
label="EPP CPP Feature"
version="4.19.0.qualifier"
version="4.20.0.qualifier"
provider-name="Eclipse Packaging Project"
plugin="org.eclipse.epp.package.cpp"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.cpp.feature/pom.xml
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-feature-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="4.19.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="4.20.0.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="/org.eclipse.epp.package.cpp/eclipse_lg.png"/>
Expand Down Expand Up @@ -203,8 +203,8 @@ United States, other countries, or both.
</plugins>

<features>
<feature id="org.eclipse.epp.package.cpp.feature" version="4.19.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.19.0.qualifier"/>
<feature id="org.eclipse.epp.package.cpp.feature" version="4.20.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.20.0.qualifier"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.epp.mpc" installMode="root"/>
<feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.cpp.product/p2.inf
Expand Up @@ -5,7 +5,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true

properties.1.name = org.eclipse.equinox.p2.description
properties.1.value = 2021-03 Release of the Eclipse C/C++ Developers Developers package.
properties.1.value = 2021-06 Release of the Eclipse C/C++ Developers Developers package.

properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse Packaging Project
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.cpp.product/pom.xml
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EPP CPP Bundle
Bundle-SymbolicName: org.eclipse.epp.package.cpp;singleton:=true
Bundle-Version: 4.19.0.qualifier
Bundle-Version: 4.20.0.qualifier
Bundle-Vendor: Eclipse Packaging Project
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.platform,
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.cpp/pom.xml
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-bundle-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
Expand Up @@ -22,11 +22,11 @@
</packageMetaData>
<MoreInfo>
<NewAndNoteworthy
url="https://www.eclipse.org/eclipse/news/4.19/"
url="https://www.eclipse.org/eclipse/news/4.20/"
project="Eclipse Platform" />
</MoreInfo>

<!-- name, the name of the product, used in naming the created files. -->
<product name="eclipse-dsl-2021-03-R" />
<product name="eclipse-dsl-2021-06-M1" />

</configuration>
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.dsl.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.package.dsl.feature"
label="EPP DSL Feature"
version="4.19.0.qualifier"
version="4.20.0.qualifier"
provider-name="Eclipse Packaging Project"
plugin="org.eclipse.epp.package.dsl"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.dsl.feature/pom.xml
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-feature-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse DSL Tools" uid="epp.package.dsl" id="org.eclipse.epp.package.dsl.product" application="org.eclipse.ui.ide.workbench" version="4.19.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Eclipse DSL Tools" uid="epp.package.dsl" id="org.eclipse.epp.package.dsl.product" application="org.eclipse.ui.ide.workbench" version="4.20.0.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="/org.eclipse.epp.package.dsl/eclipse_lg.png"/>
Expand Down Expand Up @@ -203,8 +203,8 @@ United States, other countries, or both.
</plugins>

<features>
<feature id="org.eclipse.epp.package.dsl.feature" version="4.19.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.19.0.qualifier"/>
<feature id="org.eclipse.epp.package.dsl.feature" version="4.20.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.20.0.qualifier"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.epp.mpc" installMode="root"/>
<feature id="org.eclipse.emf.ecore.xcore.sdk" installMode="root"/>
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.dsl.product/p2.inf
Expand Up @@ -5,7 +5,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true

properties.1.name = org.eclipse.equinox.p2.description
properties.1.value = 2021-03 Release of the Eclipse DSL Tools package.
properties.1.value = 2021-06 Release of the Eclipse DSL Tools package.

properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse Packaging Project
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.dsl.product/pom.xml
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EPP DSL Bundle
Bundle-SymbolicName: org.eclipse.epp.package.dsl;singleton:=true
Bundle-Version: 4.19.0.qualifier
Bundle-Version: 4.20.0.qualifier
Bundle-Vendor: Eclipse Packaging Project
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.platform,
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.dsl/pom.xml
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-bundle-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
</parent>

Expand Down
Expand Up @@ -29,6 +29,6 @@ To avoid compatibility issues with pre 6.x plug-ins, it is recommended to <b>cre
</packageMetaData>

<!-- name, the name of the product, used in naming the created files. -->
<product name="eclipse-embedcpp-2021-03-R" />
<product name="eclipse-embedcpp-2021-06-M1" />

</configuration>
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.package.embedcpp.feature"
label="EPP Embedded CPP Feature"
version="4.19.0.qualifier"
version="4.20.0.qualifier"
provider-name="Eclipse Packaging Project"
plugin="org.eclipse.epp.package.embedcpp"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.embedcpp.feature/pom.xml
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-feature-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse IDE for Embedded C/C++ Developers" uid="epp.package.embedcpp" application="org.eclipse.ui.ide.workbench" version="4.19.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Eclipse IDE for Embedded C/C++ Developers" uid="epp.package.embedcpp" application="org.eclipse.ui.ide.workbench" version="4.20.0.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="/org.eclipse.epp.package.embedcpp/eclipse_lg.png"/>
Expand Down Expand Up @@ -203,8 +203,8 @@ United States, other countries, or both.
</plugins>

<features>
<feature id="org.eclipse.epp.package.embedcpp.feature" version="4.19.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.19.0.qualifier"/>
<feature id="org.eclipse.epp.package.embedcpp.feature" version="4.20.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.20.0.qualifier"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.epp.mpc" installMode="root"/>
<feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.embedcpp.product/p2.inf
Expand Up @@ -5,7 +5,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true

properties.1.name = org.eclipse.equinox.p2.description
properties.1.value = 2021-03 Release of the Eclipse Embedded C/C++ Developers Developers package.
properties.1.value = 2021-06 Release of the Eclipse Embedded C/C++ Developers Developers package.

properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse Packaging Project
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.embedcpp.product/pom.xml
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>

Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EPP Embedded CPP Bundle
Bundle-SymbolicName: org.eclipse.epp.package.embedcpp;singleton:=true
Bundle-Version: 4.19.0.qualifier
Bundle-Version: 4.20.0.qualifier
Bundle-Vendor: Eclipse Packaging Project
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.platform,
Expand Down
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.embedcpp/pom.xml
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.epp</groupId>
<artifactId>org.eclipse.epp-bundle-parent</artifactId>
<version>4.19.0-SNAPSHOT</version>
<version>4.20.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
</parent>

Expand Down

0 comments on commit 19bd3df

Please sign in to comment.