Skip to content

Commit

Permalink
Merge pull request #4 from eclipse/bump_to_1.3.2
Browse files Browse the repository at this point in the history
[releng] bump to 1.3.2
  • Loading branch information
tguiu authored Feb 18, 2020
2 parents 490342d + b55fb68 commit ceb5359
Show file tree
Hide file tree
Showing 54 changed files with 134 additions and 142 deletions.
9 changes: 0 additions & 9 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ pipeline {
}
}
stage('Deploy') {
when {
expression { return "${env.FROM_PR}".contains("false") }
}
steps {
sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
sh '''
Expand All @@ -41,11 +38,5 @@ pipeline {
}
}
}
post {
always {
archiveArtifacts artifacts: '**/*.log,*.xml,**/*.layout'
junit '*.xml'
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.polarsys.capella.extension.sdk.feature"
label="Capella Extension SDK Feature"
version="1.3.1.qualifier"
version="1.3.2.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion extension/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
</project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Version: 1.3.1.qualifier
Bundle-Version: 1.3.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.polarsys.capella.extension.genchain.egf;singleton:=true
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Version: 1.3.1.qualifier
Bundle-Version: 1.3.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.polarsys.capella.extension.genchain.model.edit;singleton:=true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Version: 1.3.1.qualifier
Bundle-Version: 1.3.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.polarsys.capella.extension.genchain.model;singleton:=true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Version: 1.3.1.qualifier
Bundle-Version: 1.3.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-ClassPath: .
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Version: 1.3.1.qualifier
Bundle-Version: 1.3.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.polarsys.capella.extension.tools.ui;singleton:=true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Version: 1.3.1.qualifier
Bundle-Version: 1.3.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.polarsys.capella.extension.tools;singleton:=true
Expand Down
2 changes: 1 addition & 1 deletion extension/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../../releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extension/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion gendoc/tests/org.polarsys.capella.gen.doc.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../../releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion gendoc/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.polarsys.capella.studio.product.feature"
label="%featureName"
version="1.3.1.qualifier"
version="1.3.2.qualifier"
provider-name="%providerName"
plugin="org.polarsys.capella.studio.product">

Expand Down
2 changes: 1 addition & 1 deletion product/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.polarsys.capella.studio.product;singleton:=true
Bundle-Version: 1.3.1.qualifier
Bundle-Version: 1.3.2.qualifier
Bundle-Activator: org.polarsys.capella.studio.product.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
/*******************************************************************************
* Copyright (c) 2015 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
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* THALES GLOBAL SERVICES - Initial API and implementation
*******************************************************************************/
package org.polarsys.capella.studio.product;
/*******************************************************************************
* Copyright (c) 2015 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
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* THALES GLOBAL SERVICES - Initial API and implementation
*******************************************************************************/
package org.polarsys.capella.studio.product;

import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;

/**
* @author Thomas Guiu
*
* @author Thomas Guiu
*
*/
public class Activator extends AbstractUIPlugin {

Expand Down
2 changes: 1 addition & 1 deletion product/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../releng/plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
</project>
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, 2019 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
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Thales - initial API and implementation
<!--
Copyright (c) 2006, 2019 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
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Thales - initial API and implementation
-->
<feature
id="org.polarsys.capella.studio.releng.capella.feature"
label="Releng feature Capella for capella studio"
version="1.3.1.qualifier"
version="1.3.2.qualifier"
provider-name="%providerName">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
<properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, 2019 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
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Thales - initial API and implementation
<!--
Copyright (c) 2006, 2019 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
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Thales - initial API and implementation
-->
<feature
id="org.polarsys.capella.studio.releng.eclipse.feature"
label="%featureName"
version="1.3.1.qualifier"
version="1.3.2.qualifier"
provider-name="%providerName">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
<properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, 2019 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
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Thales - initial API and implementation
<!--
Copyright (c) 2006, 2019 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
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Thales - initial API and implementation
-->
<feature
id="org.polarsys.capella.studio.releng.feature"
label="%featureName"
version="1.3.1.qualifier"
version="1.3.2.qualifier"
provider-name="%providerName">

<description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, 2019 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
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Thales - initial API and implementation
<!--
Copyright (c) 2006, 2019 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
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Thales - initial API and implementation
-->
<feature
id="org.polarsys.capella.studio.releng.kitalpha.feature"
label="%featureName"
version="1.3.1.qualifier"
version="1.3.2.qualifier"
provider-name="%providerName">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../../plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion releng/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../plugins/org.polarsys.capella.studio.releng.parent</relativePath>
</parent>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys.capella</groupId>
<artifactId>org.polarsys.capella.studio.releng.parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../org.polarsys.capella.studio.releng.parent</relativePath>
</parent>

Expand All @@ -44,13 +44,13 @@
<modules>
<!-- Plugin Tests Junit Capella Studio -->
<module>../../../tests/plugins/org.polarsys.capella.studio.test</module>
<module>../../../extension/tests/org.polarsys.capella.extension.rcptt</module>
<module>../../../vpdsl/tests/org.polarsys.capella.ad.viewpoint.dsl.tests</module>
<!--module>../../../extension/tests/org.polarsys.capella.extension.rcptt</module-->
<!--module>../../../vpdsl/tests/org.polarsys.capella.ad.viewpoint.dsl.tests</module-->
<!-- Plugin Tests RCPTT Capella Studio -->
<module>../../../gendoc/tests/org.polarsys.capella.gen.doc.tests</module>
<!-- >module>../../../gendoc/tests/org.polarsys.capella.gen.doc.tests</module>
<module>../../../vpdsl/tests/org.polarsys.capella.studio.ad.viewpoint.rcptt</module>
<module>../../../vpdsl/tests/capellastudio.vpdsl.qualityassessment.reverse.tests</module>
<module>../../../vpdsl/tests/capellastudio.vpdsl.qualityassessment.tests</module>
<module>../../../vpdsl/tests/capellastudio.vpdsl.qualityassessment.tests</module-->


<!-- Features -->
Expand Down
Loading

0 comments on commit ceb5359

Please sign in to comment.