Skip to content

Commit

Permalink
[Releng] Migrate to Capella 6.0
Browse files Browse the repository at this point in the history
Change-Id: I685d427ea24fa0f6ea2c00605fb342e627bd9dc7
Signed-off-by: Tu Ton <[email protected]>
  • Loading branch information
minhtutonthat committed Feb 15, 2023
1 parent 967c014 commit dffa6bf
Show file tree
Hide file tree
Showing 44 changed files with 677 additions and 182 deletions.
104 changes: 99 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,99 @@
capellaAddon {
url = 'https://github.com/eclipse/capella-vpms.git'
name = 'vpms'
targetPlatform = 'releng/org.polarsys.capella.vp.ms.target/pom.xml'
}
pipeline {
agent {
label 'migration'
}

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

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

stages {

stage('Generate Target Platform') {
steps {
script {
if(github.isPullRequest()){
github.buildStartedComment()
}

currentBuild.description = BUILD_KEY

sh 'env'
sh 'mvn clean verify -f releng/org.polarsys.capella.vp.ms.target/pom.xml'
sh 'cat releng/org.polarsys.capella.vp.ms.target/tp/capella.target-definition.target'
}
}
}

stage('Build and Package') {
steps {
wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
script {
def customParams = github.isPullRequest() ? '-DSKIP_SONAR=true' : '-Psign'

sh "mvn -Djacoco.skip=true -DjavaDocPhase=none ${customParams} clean verify -f pom.xml"
}
}
}
}

stage('Deploy to Nightly') {
steps {
script {
def deploymentDirName =
(github.isPullRequest() ? "${BUILD_KEY}-${BRANCH_NAME}-${BUILD_ID}" : "${BRANCH_NAME}-${BUILD_ID}")
.replaceAll('/','-')

deployer.addonNightlyDropins("${WORKSPACE}/releng/org.polarsys.capella.vp.ms.site/target/*-dropins-*.zip", deploymentDirName)
deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.vp.ms.site/target/*-updateSite-*.zip", deploymentDirName)

}
}
}

}

post {
always {
archiveArtifacts artifacts: '**/*.log, *.log, *.xml, **/*.layout, *.exec'
}

success {
script {
if(github.isPullRequest()){
github.buildSuccessfullComment()
}
}
}

unstable {
script {
if(github.isPullRequest()){
github.buildUnstableComment()
}
}
}

failure {
script {
if(github.isPullRequest()){
github.buildFailedComment()
}
}
}

aborted {
script {
if(github.isPullRequest()){
github.buildAbortedComment()
}
}
}
}
}
4 changes: 2 additions & 2 deletions features/org.polarsys.capella.vp.ms.ag.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.polarsys.capella.vp.ms.ag.feature"
label="%featureName"
version="0.18.0.qualifier"
version="0.19.0.qualifier"
provider-name="%providerName">

<description>
Expand All @@ -22,7 +22,7 @@
version="0.0.0"/>

<requires>
<import feature="org.polarsys.capella.vp.ms.feature" version="0.18.0.qualifier"/>
<import feature="org.polarsys.capella.vp.ms.feature" version="0.19.0.qualifier"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion features/org.polarsys.capella.vp.ms.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.polarsys.capella.vp.ms.feature"
label="%featureName"
version="0.18.1.qualifier"
version="0.19.0.qualifier"
provider-name="%providerName">

<description>
Expand Down
4 changes: 2 additions & 2 deletions features/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017 THALES GLOBAL SERVICES.
Copyright (c) 2017, 2023 THALES GLOBAL SERVICES.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand All @@ -18,7 +18,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.vp.ms-addon</artifactId>
<version>0.18.1-SNAPSHOT</version>
<version>0.19.0-SNAPSHOT</version>
</parent>
<modules>
<module>org.polarsys.capella.vp.ms.feature</module>
Expand Down
5 changes: 3 additions & 2 deletions plugins/ms.design/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: ms.design;singleton:=true
Bundle-Localization: plugin
Bundle-Version: 0.18.1.qualifier
Bundle-Version: 0.19.0.qualifier
Bundle-Activator: ms.design.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down Expand Up @@ -33,7 +33,8 @@ Require-Bundle: org.eclipse.ui,
org.w3c.css.sac;bundle-version="1.3.1",
org.eclipse.gmf.runtime.diagram.ui,
org.polarsys.capella.core.sirius.analysis,
org.eclipse.sirius.diagram.ui;bundle-version="6.3.0"
org.eclipse.sirius.diagram.ui;bundle-version="6.3.0",
org.polarsys.kitalpha.sirius.rotativeimage
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: ms.configuration.services.cs,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017, 2021 THALES GLOBAL SERVICES.
* Copyright (c) 2017, 2023 THALES GLOBAL SERVICES.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -48,7 +48,7 @@
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt;
import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt;
import org.eclipse.sirius.diagram.business.internal.metamodel.helper.EdgeMappingHelper;
import org.eclipse.sirius.diagram.business.internal.metamodel.helper.NodeMappingHelper;
import org.eclipse.sirius.diagram.description.DiagramElementMapping;
Expand All @@ -62,7 +62,7 @@
import org.eclipse.sirius.table.metamodel.table.DLine;
import org.eclipse.sirius.table.metamodel.table.DTable;
import org.eclipse.sirius.viewpoint.DSemanticDecorator;
import org.eclipse.sirius.viewpoint.SiriusPlugin;
import org.eclipse.sirius.tools.api.SiriusPlugin;
import org.eclipse.sirius.viewpoint.description.DAnnotation;
import org.eclipse.sirius.viewpoint.description.DModelElement;
import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2006, 2019 THALES GLOBAL SERVICES.
* Copyright (c) 2006, 2023 THALES GLOBAL SERVICES.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -22,8 +22,8 @@
import org.eclipse.sirius.diagram.WorkspaceImage;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNode4EditPart;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.WorkspaceImageEditPart;
import org.polarsys.capella.core.sirius.analysis.editpart.RotativeDNode4EditPart;
import org.polarsys.capella.core.sirius.analysis.editpart.RotativeImageEditPart;
import org.polarsys.kitalpha.sirius.rotativeimage.editpart.RotativeDNode4EditPart;
import org.polarsys.kitalpha.sirius.rotativeimage.editpart.RotativeImageEditPart;

/**
* Specific Edit Part Provider for rotative image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.core.data.common.statemachine.validation;singleton:=true
Bundle-Version: 0.18.0.qualifier
Bundle-Version: 0.19.0.qualifier
Require-Bundle: org.polarsys.capella.core.validation,
org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?eclipse version="3.4"?>

<!--
Copyright (c) 2017, 2020 THALES GLOBAL SERVICES and others.
Copyright (c) 2017, 2023 THALES GLOBAL SERVICES and others.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -20,13 +20,13 @@
point="org.eclipse.emf.validation.constraintProviders">
<constraintProvider>
<package
namespaceUri="http://www.polarsys.org/capella/core/fa/5.0.0">
namespaceUri="http://www.polarsys.org/capella/core/fa/6.0.0">
</package>
<package
namespaceUri="http://www.polarsys.org/capella/core/common/5.0.0">
namespaceUri="http://www.polarsys.org/capella/core/common/6.0.0">
</package>
<package
namespaceUri="http://www.polarsys.org/capella/core/interaction/5.0.0">
namespaceUri="http://www.polarsys.org/capella/core/interaction/6.0.0">
</package>
<package
namespaceUri="http://www.polarsys.org/capella/ms/0.11">
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.polarsys.capella.vp.ms.af/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.ms.af;singleton:=true
Bundle-Version: 0.18.0.qualifier
Bundle-Version: 0.19.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.polarsys.kitalpha.ad.viewpoint.ui
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.polarsys.capella.vp.ms.af/model/ms.vp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="ms" id="org.polarsys.capella.vp.ms" vpid="_rs4akLUdEeWSn8ImNVQfrQ" version="0.17.0.qualifier">
<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="ms" id="org.polarsys.capella.vp.ms" vpid="_rs4akLUdEeWSn8ImNVQfrQ" version="0.19.0.qualifier">
<metamodel>
<models href="../../org.polarsys.capella.vp.ms/models/ms.ecore#/"/>
</metamodel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.ms.doc;singleton:=true
Bundle-Version: 0.18.0.qualifier
Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: %providerName
Automatic-Module-Name: org.polarsys.capella.vp.ms.doc
Bundle-Localization: plugin
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.ms.edit;singleton:=true
Automatic-Module-Name: org.polarsys.capella.vp.ms.edit
Bundle-Version: 0.18.1.qualifier
Bundle-Version: 0.19.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.polarsys.capella.vp.ms.provider.MsEditPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.ms.expression.ag;singleton:=true
Bundle-Version: 0.18.0.qualifier
Bundle-Version: 0.19.0.qualifier
Automatic-Module-Name: org.polarsys.capella.vp.ms.expression.ag
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.apache.poi;bundle-version="[4.1.0,4.2.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.ms.expression;singleton:=true
Bundle-Version: 0.18.0.qualifier
Bundle-Version: 0.19.0.qualifier
Automatic-Module-Name: org.polarsys.capella.vp.ms.expression
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.antlr.runtime;bundle-version="4.7.2",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.polarsys.capella.vp.ms.fc/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.ms.fc;singleton:=true
Bundle-Version: 0.18.0.qualifier
Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
8 changes: 4 additions & 4 deletions plugins/org.polarsys.capella.vp.ms.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.capella.vp.ms.tests
Bundle-Version: 0.18.1.qualifier
Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: %providerName
Automatic-Module-Name: org.polarsys.capella.vp.ms.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.antlr.runtime;bundle-version="4.7.2",
org.junit.jupiter.api;bundle-version="5.6.0",
org.junit.jupiter.params;bundle-version="5.6.0",
org.polarsys.capella.vp.ms.expression;bundle-version="0.18.0",
org.polarsys.capella.vp.ms.expression;bundle-version="0.19.0",
org.polarsys.capella.test.framework;bundle-version="5.0.0",
org.polarsys.capella.test.transition.ju;bundle-version="5.0.0",
org.polarsys.capella.vp.ms;bundle-version="0.18.0",
ms.design;bundle-version="0.17.0",
org.polarsys.capella.vp.ms;bundle-version="0.19.0",
ms.design;bundle-version="0.19.0",
org.eclipse.sirius.diagram;bundle-version="6.4.0",
org.eclipse.sirius.tests.swtbot;bundle-version="6.4.0",
org.eclipse.sirius.tests.swtbot.support;bundle-version="6.4.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_UaMv4GIQEeuu9q00hCGACA">
<viewpointReferences id="_Ua0a8GIQEeuu9q00hCGACA" vpId="org.polarsys.capella.core.viewpoint" version="5.1.0"/>
<viewpointReferences id="_YsvAcGIuEeuXqNx4NpkSGw" vpId="org.polarsys.capella.vp.ms" version="0.17.0.qualifier"/>
<viewpointReferences id="_Ua0a8GIQEeuu9q00hCGACA" vpId="org.polarsys.capella.core.viewpoint" version="6.0.0"/>
<viewpointReferences id="_YsvAcGIuEeuXqNx4NpkSGw" vpId="org.polarsys.capella.vp.ms" version="0.19.0.qualifier"/>
</metadata:Metadata>
Loading

0 comments on commit dffa6bf

Please sign in to comment.