Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/checkout…
Browse files Browse the repository at this point in the history
…-4.0.0
  • Loading branch information
akurtakov authored Sep 6, 2023
2 parents 6347e6e + 83ce6d4 commit d5c1b2a
Show file tree
Hide file tree
Showing 22 changed files with 38 additions and 41 deletions.
9 changes: 3 additions & 6 deletions JenkinsJobs/Builds/I_build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,14 @@ for (STREAM in STREAMS){
# format: Minute Hour Day Month Day of the week (0-7)
# - - - Integration Eclipse SDK builds - - -
# 2023-09 Release Schedule
# 2023-12 Release Schedule
# Normal : 6 PM every day (1/6 - 2/9)
# 0 18 * * *
# Milestone/RC Schedule 5/12 - 5/31
# Milestone/RC Schedule
# Post M1, no nightlies, I-builds only. (Be sure to "turn off" for tests and sign off days)
# 0 6 1-7 7 5-7,1-3
# 0 18 30,1-7 6-7 5-7,1-3
0 6 11-30 8 5-7,1-3
0 18 11-30 8 5-7,1-3
""")
}
}
Expand Down
12 changes: 6 additions & 6 deletions cje-production/buildproperties.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
LOCAL_REPO="localMavenRepo"

# Base builder parameters
BASEBUILDER_TAG="4.28"
API_PREV_REF_LABEL="4.28"
BASEBUILDER_TAG="4.29"
API_PREV_REF_LABEL="4.29"
#API_FREEZE_REF_LABEL="4.30RC1"
API_FREEZE_REF_LABEL=""
# Change to appropriate versions and uncomment when entering API freeze
#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202208241800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
# Otherwise set to a blank space
FREEZE_PARAMS=" "

PREVIOUS_RELEASE_VER="4.28"
PREVIOUS_RELEASE_REPO_ID="4.28"
PREVIOUS_RELEASE_VER="4.29RC2a"
PREVIOUS_RELEASE_REPO_ID="4.29-I-builds"
#build id for getting repo
BASEBUILD_ID="R-4.28-202306050440"
BASEBUILD_ID="I20230903-1000"
#release id for downloading eclipse
PREVIOUS_RELEASE_ID="R-4.28-202306050440"
PREVIOUS_RELEASE_ID="S-4.29RC2a-202309031000"

BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.30.0/R-3.30.0-20230603084739/repositoryunittests/"
Expand Down
6 changes: 3 additions & 3 deletions cje-production/cleaners/cleanupNightlyRepo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ function cleanRepo ()
workspace=$1
remoteBase="/home/data/httpd/download.eclipse.org"

eclipseIRepo="${remoteBase}/eclipse/updates/4.29-I-builds"
eclipseYRepo="${remoteBase}/eclipse/updates/4.29-Y-builds"
eclipsePRepo="${remoteBase}/eclipse/updates/4.29-P-builds"
eclipseIRepo="${remoteBase}/eclipse/updates/4.30-I-builds"
eclipseYRepo="${remoteBase}/eclipse/updates/4.30-Y-builds"
eclipsePRepo="${remoteBase}/eclipse/updates/4.30-P-builds"
eclipseBuildTools="${remoteBase}/eclipse/updates/buildtools"

doDryrun=
Expand Down
8 changes: 4 additions & 4 deletions cje-production/scripts/checkComposites/checkComposites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ repoHttpAccess=https://download.eclipse.org
repoAccess=${repoHttpAccess}
# TODO: reduce this list soon
repoList="\
/eclipse/updates/4.28/ \
/eclipse/updates/4.29-Y-builds/ \
/eclipse/updates/4.29-P-builds/ \
/eclipse/updates/4.29/ \
/eclipse/updates/4.29-I-builds/ \
/eclipse/updates/4.30-Y-builds/ \
/eclipse/updates/4.30-P-builds/ \
/eclipse/updates/4.30/ \
/eclipse/updates/4.30-I-builds/ \
"


Expand Down
2 changes: 1 addition & 1 deletion eclipse-platform-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
such as Version: Mars (4.5), for main features.
See bug 328139.
-->
<releaseName>2023-09</releaseName>
<releaseName>2023-12</releaseName>
<!--
The releaseNumbers below, for SDK and Platform, might be
thought of as the "marketing number" or "branding number",
Expand Down
2 changes: 1 addition & 1 deletion eclipse.jdt
2 changes: 1 addition & 1 deletion eclipse.jdt.core.binaries
2 changes: 1 addition & 1 deletion eclipse.platform
Submodule eclipse.platform updated 46 files
+1 −1 debug/pom.xml
+1 −1 platform/org.eclipse.platform/META-INF/MANIFEST.MF
+ platform/org.eclipse.platform/splash.png
+1 −1 platform/org.eclipse.sdk/META-INF/MANIFEST.MF
+1 −1 pom.xml
+1 −1 resources/bundles/org.eclipse.core.filesystem.linux.aarch64/pom.xml
+1 −1 resources/bundles/org.eclipse.core.filesystem.linux.loongarch64/pom.xml
+1 −1 resources/bundles/org.eclipse.core.filesystem.linux.ppc64le/pom.xml
+1 −1 resources/bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml
+1 −1 resources/bundles/org.eclipse.core.filesystem.macosx/pom.xml
+1 −1 resources/bundles/org.eclipse.core.filesystem.win32.x86_64/pom.xml
+1 −1 resources/bundles/org.eclipse.core.resources.win32.x86_64/pom.xml
+1 −1 resources/bundles/org.eclipse.core.tools.resources/pom.xml
+1 −1 resources/examples/pom.xml
+1 −1 resources/pom.xml
+1 −1 resources/tests/org.eclipse.core.tests.resources.saveparticipant/pom.xml
+1 −1 resources/tests/org.eclipse.core.tests.resources/pom.xml
+1 −1 resources/tests/pom.xml
+1 −1 runtime/pom.xml
+1 −1 team/bundles/org.eclipse.compare.win32/pom.xml
+1 −1 team/bundles/org.eclipse.core.net.linux/pom.xml
+1 −1 team/bundles/org.eclipse.core.net.win32.x86_64/pom.xml
+1 −1 team/bundles/org.eclipse.core.net.win32/pom.xml
+1 −1 team/examples/org.eclipse.compare.examples.xml/pom.xml
+1 −1 team/examples/org.eclipse.compare.examples/pom.xml
+1 −1 team/examples/org.eclipse.team.examples.filesystem/pom.xml
+1 −1 team/pom.xml
+1 −1 team/tests/org.eclipse.core.tests.net/pom.xml
+1 −1 team/tests/org.eclipse.jsch.tests/pom.xml
+1 −1 team/tests/org.eclipse.team.tests.core/pom.xml
+1 −1 team/tests/pom.xml
+1 −1 ua/infocenter-web/infocenter-app/pom.xml
+1 −1 ua/infocenter-web/infocenter-product/pom.xml
+1 −1 ua/infocenter-web/pom.xml
+1 −1 ua/org.eclipse.help.base/pom.xml
+1 −1 ua/org.eclipse.help.webapp/pom.xml
+1 −1 ua/org.eclipse.help/pom.xml
+1 −1 ua/org.eclipse.tips.feature/pom.xml
+1 −1 ua/org.eclipse.ua.tests.doc/pom.xml
+1 −1 ua/org.eclipse.ua.tests/pom.xml
+1 −1 ua/org.eclipse.ui.cheatsheets/pom.xml
+1 −1 ua/org.eclipse.ui.intro.quicklinks.examples/pom.xml
+1 −1 ua/org.eclipse.ui.intro.solstice.examples/pom.xml
+1 −1 ua/org.eclipse.ui.intro/pom.xml
+1 −1 ua/pom.xml
+1 −1 ua/tests-pom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
-splitIndex
-windowtitle "Eclipse JDT API Specification"
-doctitle "Eclipse JDT API Specification"
-header "<span style='font-size:small'><b>Eclipse JDT</b><br>2023-09 (4.29)</span>"
-header "<span style='font-size:small'><b>Eclipse JDT</b><br>2023-12 (4.30)</span>"
-bottom "<br><span style='font-size:small;float:right'>Copyright (c) 2000, 2023 Eclipse Contributors and others. All rights reserved.</span><span style='font-size:small'><a href='{@docRoot}/../misc/api-usage-rules.html'>Guidelines for using Eclipse APIs.</a></span>"
-group "Java development tools core packages" "org.eclipse.jdt.core
;org.eclipse.jdt.core.*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

-windowtitle "Eclipse PDE API Specification"
-doctitle "Eclipse PDE API Specification"
-header "<span style='font-size:small'><b>Eclipse PDE</b><br>2023-09 (4.29)</span>"
-header "<span style='font-size:small'><b>Eclipse PDE</b><br>2023-12 (4.30)</span>"
-bottom "<br><span style='font-size:small;float:right'>Copyright (c) 2000, 2023 Eclipse Contributors and others. All rights reserved.</span><span style='font-size:small'><a href='{@docRoot}/../misc/api-usage-rules.html'>Guidelines for using Eclipse APIs.</a></span>"
-link https://docs.oracle.com/en/java/javase/17/docs/api
-link https://docs.osgi.org/javadoc/osgi.core/8.0.0/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
-splitIndex
-windowtitle "Eclipse Platform API Specification"
-doctitle "Eclipse Platform API Specification"
-header "<span style='font-size:small'><b>Eclipse Platform</b><br>2023-09 (4.29)</span>"
-header "<span style='font-size:small'><b>Eclipse Platform</b><br>2023-12 (4.30)</span>"
-bottom "<br><span style='font-size:small;float:right'>Copyright (c) 2000, 2023 Eclipse Contributors and others. All rights reserved.</span><span style='font-size:small'><a href='{@docRoot}/../misc/api-usage-rules.html'>Guidelines for using Eclipse APIs.</a></span>"
-link https://docs.oracle.com/en/java/javase/17/docs/api
-link https://docs.osgi.org/javadoc/osgi.core/8.0.0/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature id="org.eclipse.jdt.java21patch" version="0.0.0" patch="true">
<category name="Eclipse Java 21 support for 2023-09 development stream"/>
<category name="Eclipse Java 21 support for 2023-12 development stream"/>
</feature>
<feature id="org.eclipse.jdt.java21patch.source" version="0.0.0" patch="true">
<category name="Eclipse Java 21 support for 2023-09 development stream"/>
<category name="Eclipse Java 21 support for 2023-12 development stream"/>
</feature>
<category-def name="Eclipse Java 21 support for 2023-09 development stream" label="Eclipse Java 21 support for 2023-09 development stream">
<category-def name="Eclipse Java 21 support for 2023-12 development stream" label="Eclipse Java 21 support for 2023-12 development stream">
<description>
Eclipse Java 21 support for 2023-09 development stream.
Eclipse Java 21 support for 2023-12 development stream.
</description>
</category-def>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
# This file should be translated.

# "featureName" property - name of the feature
featureName=Eclipse JDT (Java Development Tools) Source Patch with Java 21 support for 2023-09 development stream
featureName=Eclipse JDT (Java Development Tools) Source Patch with Java 21 support for 2023-12 development stream

# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org

# "description" property - description of the feature
description=Eclipse Java 21 support for 2023-09 development stream.\n
description=Eclipse Java 21 support for 2023-12 development stream.\n

# "copyright" property - text of the "Feature Update Copyright"
copyright=\
Expand Down
2 changes: 1 addition & 1 deletion rt.equinox.p2
Submodule rt.equinox.p2 updated 1 files
+2 −2 pom.xml

0 comments on commit d5c1b2a

Please sign in to comment.