Skip to content

Commit a339b64

Browse files
authored
Merge branch 'eclipse-platform:master' into master
2 parents 27e19be + dd30aff commit a339b64

69 files changed

Lines changed: 404 additions & 226 deletions

File tree

Some content is hidden

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

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
--threads 1C
7373
-DforkCount=1
7474
'-Dnative=${{ matrix.config.native }}'
75-
-Papi-check
75+
-Papi-check -Pjavadoc
7676
'-Dtycho.baseline.replace=none'
7777
--fail-at-end
7878
-DskipNativeTests=false

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def getNativeJdkUrl(String os, String arch) { // To update the used JDK version
7171
}
7272

7373
def getLatestGitTag() {
74-
return sh(script: 'git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*', returnStdout: true).strip()
74+
return sh(script: 'git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*', returnStdout: true).trim()
7575
}
7676

7777
def getSWTVersions() { // must be called from the repository root
@@ -89,7 +89,7 @@ pipeline {
8989
skipDefaultCheckout() // Specialiced checkout is performed below
9090
timestamps()
9191
timeout(time: 180, unit: 'MINUTES')
92-
buildDiscarder(logRotator(numToKeepStr:'5'))
92+
buildDiscarder(logRotator(numToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '20' : '5', artifactNumToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '3' : '1' ))
9393
disableConcurrentBuilds(abortPrevious: true)
9494
}
9595
agent {
@@ -159,7 +159,7 @@ pipeline {
159159
def sources = sourceFoldersProps.collectEntries{ k, src -> [ k, src.split(',').collect{ f -> '\'' + f + '\''}.join(' ') ] }
160160
for(ws in allWS) {
161161
def diff = sh(script: "git diff HEAD ${swtTag} ${sources.src_common} ${sources['src_' + ws]}", returnStdout: true)
162-
if (!diff.strip().isEmpty()) {
162+
if (!diff.trim().isEmpty()) {
163163
NATIVES_CHANGED += ws
164164
}
165165
}
@@ -351,7 +351,7 @@ pipeline {
351351
sh '''
352352
mvn clean verify \
353353
--batch-mode --threads 1C -V -U -e -DforkCount=0 \
354-
-Papi-check \
354+
-Pbree-libs -Papi-check -Pjavadoc \
355355
-Dcompare-version-with-baselines.skip=false \
356356
-Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \
357357
-Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true

binaries/.settings/org.eclipse.jdt.core.prefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
4646
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
4747
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
4848
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
49-
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
49+
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
5050
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
5151
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
5252
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3011
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3011
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595
2+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3011
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3011
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595
2+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3011
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595
2+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3011
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595
2+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3011

0 commit comments

Comments
 (0)