Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
Diffstat (limited to 'releng')
-rw-r--r--releng/CDT.setup4
-rw-r--r--releng/org.eclipse.cdt-feature/p2.inf4
-rw-r--r--releng/org.eclipse.cdt.target/cdt.target12
-rwxr-xr-xreleng/scripts/check_code_cleanliness.sh99
-rwxr-xr-xreleng/scripts/check_mvn_plugin_versions.sh13
5 files changed, 30 insertions, 102 deletions
diff --git a/releng/CDT.setup b/releng/CDT.setup
index 9df0b1396f..9430d61d0b 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -123,6 +123,10 @@
<requirement
name="org.junit.source"/>
<requirement
+ name="org.junit.jupiter.api"/>
+ <requirement
+ name="org.junit.jupiter.api.source"/>
+ <requirement
name="org.mockito"/>
<requirement
name="org.hamcrest"/>
diff --git a/releng/org.eclipse.cdt-feature/p2.inf b/releng/org.eclipse.cdt-feature/p2.inf
index 552f6aa698..6b104c1915 100644
--- a/releng/org.eclipse.cdt-feature/p2.inf
+++ b/releng/org.eclipse.cdt-feature/p2.inf
@@ -1,3 +1,3 @@
instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/9.9,type:0,name:CDT,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/9.9,type:1,name:CDT,enabled:false);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/9.10,type:0,name:CDT,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/9.10,type:1,name:CDT,enabled:false);
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 3be416a720..0fd87c5c0a 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="cdt" sequenceNumber="62">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="cdt" sequenceNumber="64">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
@@ -17,9 +17,11 @@
<unit id="org.hamcrest.core" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="org.junit.source" version="0.0.0"/>
+<unit id="org.junit.jupiter.api" version="0.0.0"/>
+<unit id="org.junit.jupiter.api.source" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20191118194249/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="0.0.0"/>
@@ -56,7 +58,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.0-simrel-2019-09-m1/"/>
+<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1-simrel-2019-12-m3/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
@@ -81,7 +83,7 @@
<unit id="org.eclipse.tools.templates.freemarker.java11.source" version="0.0.0"/>
<unit id="org.eclipse.tools.templates.ui" version="0.0.0"/>
<unit id="org.eclipse.tools.templates.ui.source" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.template-1.1.1-simrel-2018-12a/"/>
+<repository location="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
@@ -90,7 +92,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
-<repository location="https://download.eclipse.org/lsp4e/releases/0.11.0/"/>
+<repository location="http://download.eclipse.org/lsp4e/snapshots/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
diff --git a/releng/scripts/check_code_cleanliness.sh b/releng/scripts/check_code_cleanliness.sh
index c83b4d9e84..c056004d73 100755
--- a/releng/scripts/check_code_cleanliness.sh
+++ b/releng/scripts/check_code_cleanliness.sh
@@ -1,99 +1,14 @@
#!/bin/bash
-###
-# This script is run automatically as part of gerrit validation jobs
-# to ensure that coding standards have been followed. It can also be
-# used to make code follow standards again.
-#
-# The overall design is to apply a number of fixes (formatting, trim
-# whitespace, etc) and then check if there are any modifications
-# in git.
-###
-
set -e
##
-# Format code
-##
-: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.9/eclipse}
-test ! -e check_code_cleanliness_workspace
-${ECLIPSE} \
- -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
- -config $PWD/core/org.eclipse.cdt.core/.settings/org.eclipse.jdt.core.prefs \
- $PWD -data check_code_cleanliness_workspace
-rm -rf check_code_cleanliness_workspace
-
-##
-# Remove trailing whitespace.
-# The .gitattributes is used as a filter to identify files to check. Patters with
-# this "# check trailing whitespace" on the line before are checked
-##
-awk '/# remove trailing whitespace/{getline; print $1}' .gitattributes |
- while read i ; do
- echo "Removing trailing whitespace on $i files"
- git ls-files -- "$i" | xargs sed -i 's/[ \t]*$//'
- done
-
-##
-# Add all file types to .gitattributes
-##
-git ls-files | sed -E '-es@^.*/([^/]+)$@\1@' '-es@.+\.@\\\*\\.@' | sort -u | while read i ; do
- if ! grep "^$i " .gitattributes > /dev/null
- then
- echo "MISSING $i in .gitattributes, adding as text, check if that is correct"
- echo "$i text # automatically added - please verify" >> .gitattributes
- fi
-done
-
-##
-# Copy JDT/PDE preferences
+# The script is shared by all the CDT projects. When running
+# local edits, you can, for example, do:
+# SCRIPT_URL=file:///scratch/eclipse/src/cdt/cdt-infra/scripts/check_code_cleanliness.sh ./check_code_cleanliness.sh
##
-git ls-files -- \*\*/.project ':!core/org.eclipse.cdt.core/.project' | while read i ; do
- d=`dirname $i`;
- if test ! -e $d/feature.xml; then
- mkdir -p $d/.settings
- cp core/org.eclipse.cdt.core/.settings/org.eclipse.jdt.* core/org.eclipse.cdt.core/.settings/org.eclipse.pde.* $d/.settings
- # For test plug-ins we are more lenient so don't warn on some items
- if echo $i | grep '\.tests[/\.]' > /dev/null; then
- sed -i \
- '-es@org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning@org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.discouragedReference=warning@org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.deprecation=warning@org.eclipse.jdt.core.compiler.problem.deprecation=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.discouragedReference=warning@org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.emptyStatement=warning@org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.fieldHiding=warning@org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning@org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.forbiddenReference=error@org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning@' \
- '-es@org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning@org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.unusedLocal=warning@org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning@org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning@org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning@org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore@' \
- '-es@org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning@org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore@' \
- $d/.settings/org.eclipse.jdt.core.prefs
- sed -i \
- '-es@compilers.p.not-externalized-att=1@compilers.p.not-externalized-att=2@' \
- $d/.settings/org.eclipse.pde.prefs
- fi
- if echo $i | grep 'org.eclipse.cdt.examples.dsf' > /dev/null; then
- sed -i \
- '-es@org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning@org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore@' \
- $d/.settings/org.eclipse.jdt.core.prefs
- fi
- fi
-done
-##
-# Check that none of the above caused any changes
-##
-if test -z "$(git status -s)"; then
- echo "Tree looks clean!"
-else
- echo "Tree is dirty - something needs to be cleaned up in your commit"
- echo "Result of git status"
- git status
- echo "Result of git diff"
- git diff
- echo "Tree is dirty - something needs to be cleaned up in your commit (see above for git status/diff)"
- exit 1
-fi
+: ${SCRIPT_URL:=https://raw.githubusercontent.com/eclipse-cdt/cdt-infra/master/scripts/check_code_cleanliness.sh}
+export COREPROJECT=core/org.eclipse.cdt.core
+echo Obtaining check_code_cleanliness.sh from $SCRIPT_URL
+curl -sL $SCRIPT_URL | bash
diff --git a/releng/scripts/check_mvn_plugin_versions.sh b/releng/scripts/check_mvn_plugin_versions.sh
index e167d8899c..60e2aec086 100755
--- a/releng/scripts/check_mvn_plugin_versions.sh
+++ b/releng/scripts/check_mvn_plugin_versions.sh
@@ -1,6 +1,6 @@
#!/bin/bash
###############################################################################
-# Copyright (c) 2015, 2017 Ericsson, EfficiOS Inc. and others
+# Copyright (c) 2015, 2019 Ericsson, EfficiOS Inc. and others
#
#
# This program and the accompanying materials
@@ -16,12 +16,19 @@
# Marc-André Laperle - Copied to CDT
###############################################################################
+set -u # run with unset flag error so that missing parameters cause build failure
+set -e # error out on any failed commands
+set -x # echo all commands used for debugging purposes
+
# Point ourselves to the script's directory (so it can be run "out-of-tree")
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-output=`mvn versions:display-plugin-updates -U -f $DIR/../../pom.xml`
+output="$(mktemp /tmp/check_mvn_plugin_versions.output.XXXXXX)"
+${MVN:-mvn} versions:display-plugin-updates -P build-standalone-debugger-rcp -U -B -f $DIR/../../pom.xml | tee $output
#filter only updates and show unique
-summary=`echo "${output}" | grep "\\->" | sort | uniq`
+# XXX: Jonah added the exclusion for sonar-maven-plugin as Eclipse's SonarQube installation is not new enough
+# XXX: see https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Maven#AnalyzingwithSonarQubeScannerforMaven-Compatibility
+summary=`cat $output | grep "\\->" | grep -v "org.codehaus.mojo:sonar-maven-plugin" | sort | uniq`
echo -e "Summary:\n${summary}"
#remove empty lines and count lines

Back to the top