Skip to content

Commit

Permalink
[releng] Update Jenkinsfile and Maven plugins versions
Browse files Browse the repository at this point in the history
- Update JDK version to 14
- Update tycho version to 2.0.0
- Update ant version to 3.0.0

- Remove jsoup dependency

Change-Id: I38fba4328bd7384c02c33a5f81f36f791d4ece95
Signed-off-by: Sandu Postaru <sandu.postaru@thalesgroup.com>
  • Loading branch information
sandupostaru authored and pdulth committed Dec 2, 2020
1 parent 9f97ad6 commit f7eb700
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ pipeline {

tools {
maven 'apache-maven-latest'
jdk 'oracle-jdk8-latest'
jdk 'openjdk-jdk14-latest'
}

environment {
BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '')
CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/eclipse/eclipse"
CAPELLA_BRANCH = '1.4.x'
CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/capella"
CAPELLA_BRANCH = 'master'
}

stages {
Expand Down Expand Up @@ -83,8 +83,8 @@ pipeline {
steps {
script {
sh "chmod 755 ${CAPELLA_PRODUCT_PATH}"

eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", 'http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository', 'org.jsoup')
sh "chmod 755 ${WORKSPACE}/capella/jre/bin/java"

eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", capella.getTestUpdateSiteURL("${CAPELLA_BRANCH}"), 'org.polarsys.capella.test.feature.feature.group')

eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.vp.requirements.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.vp.requirements.feature.feature.group')
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<packaging>pom</packaging>

<properties>
<tycho-version>1.3.0</tycho-version>
<tycho-extras-version>1.3.0</tycho-extras-version>
<antrun-version>1.7</antrun-version>
<tycho-version>2.0.0</tycho-version>
<tycho-extras-version>2.0.0</tycho-extras-version>
<antrun-version>3.0.0</antrun-version>

<!-- for tycho -->
<tycho.scmUrl>scm:git:http://git.polarsys.org/c/capella/capella-requirements-vp.git</tycho.scmUrl>
Expand Down

0 comments on commit f7eb700

Please sign in to comment.