Skip to content

Commit d77c782

Browse files
authored
Merge branch 'eclipse-platform:master' into icon-disabling
2 parents e29bdaf + 4df99ba commit d77c782

File tree

195 files changed

+1125
-2676
lines changed

Some content is hidden

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

195 files changed

+1125
-2676
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 {
@@ -350,7 +350,7 @@ pipeline {
350350
dir('eclipse.platform.swt') {
351351
sh '''
352352
mvn clean verify \
353-
--batch-mode --threads 1C -V -U -e -DforkCount=0 \
353+
--batch-mode --threads 1C -V -U -e \
354354
-Pbree-libs -Papi-check -Pjavadoc \
355355
-Dcompare-version-with-baselines.skip=false \
356356
-Dorg.eclipse.swt.tests.junit.disable.test_isLocal=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

0 commit comments

Comments
 (0)