Skip to content

Commit

Permalink
[releng] Bump to 6.1 (#225)
Browse files Browse the repository at this point in the history 
* [releng] Bump to 6.1

Change-Id: I2b6721277d682932e2ea283ae5e620969fc977bd
Signed-off-by: Philippe DUL <[email protected]>

* [releng] Update target platform to Kitalpha nightly

Signed-off-by: Philippe DUL <[email protected]>
  • Loading branch information
@pdulth
pdulth authored Oct 21, 2022
1 parent 2e6524d commit e676e7e
Show file tree
Hide file tree
Showing 31 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion docgenhtml/features/org.polarsys.capella.docgen.configuration.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Contributors:
<feature
id="org.polarsys.capella.docgen.configuration.feature"
label="%featureName"
version="6.0.0.qualifier"
version="6.1.0.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/features/org.polarsys.capella.docgen.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Contributors:
<feature
id="org.polarsys.capella.docgen.feature"
label="%featureName"
version="6.0.0.qualifier"
version="6.1.0.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/features/org.polarsys.capella.docgen.package.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Contributors:
<feature
id="org.polarsys.capella.docgen.package.feature"
label="%featureName"
version="6.0.0.qualifier"
version="6.1.0.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/features/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.docgen</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen.commandline/META-INF/MANIFEST.MF
View file
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.docgen.commandline;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core.ui,
org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion ...enhtml/plugins/org.polarsys.capella.docgen.configuration.commandline/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core.ui,
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen.configuration.edit/META-INF/MANIFEST.MF
View file
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.docgen.configuration.edit;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.polarsys.capella.configuration.provider.ConfigurationEditPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen.configuration.editor/META-INF/MANIFEST.MF
View file
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.docgen.configuration.editor;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.polarsys.capella.configuration.presentation.ConfigurationEditorPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen.configuration.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core.ui,
org.eclipse.sirius.table
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.polarsys.capella.docgen.configuration.ui.Activator
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen.configuration/META-INF/MANIFEST.MF
View file
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.docgen.configuration;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen.doc/META-INF/MANIFEST.MF
View file
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: %BundleName
Bundle-SymbolicName: org.polarsys.capella.docgen.doc;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-Activator: org.polarsys.capella.docgen.doc.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen.preference/META-INF/MANIFEST.MF
View file
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.docgen.preference;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-Activator: org.polarsys.capella.docgen.preference.internal.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen.ui/META-INF/MANIFEST.MF
View file
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.docgen.ui;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-Activator: org.polarsys.capella.docgen.ui.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core.ui,
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/org.polarsys.capella.docgen/META-INF/MANIFEST.MF
View file
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.docgen;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Bundle-Activator: org.polarsys.capella.docgen.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.polarsys.kitalpha.doc.gen.business.core;visibility:=reexport,
Expand Down
2 changes: 1 addition & 1 deletion docgenhtml/plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.docgen</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<name>Capella XHTML DocGen Add-on</name>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.docgen</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -149,7 +149,7 @@
<artifact>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.docgen</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<classifier>releng/org.polarsys.capella.docgen.target/tp/capella.target-definition</classifier>
</artifact>
</target>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.polarsys.capella.docgen.site/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<description url="http://www.polarsys.org/capella">
Capella XHTML DocGen Add-on
</description>
<feature id="org.polarsys.capella.docgen.package.feature" version="6.0.0.qualifier">
<feature id="org.polarsys.capella.docgen.package.feature" version="6.1.0.qualifier">
<category name="org.polarsys.capella.docgen.addon"/>
</feature>
<feature id="org.polarsys.capella.docgen.package.feature.source" version="6.0.0.qualifier">
<feature id="org.polarsys.capella.docgen.package.feature.source" version="6.1.0.qualifier">
<category name="org.polarsys.capella.docgen.addon"/>
</feature>
<category-def name="org.polarsys.capella.docgen.addon" label="Capella XHTML DocGen Add-on"/>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.polarsys.capella.docgen.site/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.docgen</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.polarsys.capella.docgen.target/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<groupId>org.polarsys</groupId>
<artifactId>capella.target-definition</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<licenses>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ location capella-master "https://download.eclipse.org/capella/core/updates/night
org.polarsys.capella.rcp.feature.group lazy
}

location kitalpha-sdk-master "https://download.eclipse.org/kitalpha/updates/stable/sdk/6.0.0.S202208240845/" {
location kitalpha-docgen-master "https://download.eclipse.org/kitalpha/updates/nightly/sdk/master/" {
org.polarsys.kitalpha.doc.gen.business.core.feature.feature.group lazy
org.polarsys.kitalpha.doc.gen.business.core.feature.source.feature.group lazy
}
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/org.polarsys.capella.docgen.test.ju/META-INF/MANIFEST.MF
View file
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: Capella XHTML DocGen Generation JU Tests
Bundle-SymbolicName: org.polarsys.capella.docgen.test.ju;singleton:=true
Bundle-Version: 6.0.0.qualifier
Bundle-Version: 6.1.0.qualifier
Require-Bundle: org.junit,
org.polarsys.capella.docgen,
org.eclipse.debug.ui;bundle-version="3.14.500",
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.afm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?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="_sKgM8OyNEeywTbjfxGsLDg">
<viewpointReferences id="_sdRX8OyNEeywTbjfxGsLDg" vpId="org.polarsys.capella.core.viewpoint" version="6.0.0"/>
<viewpointReferences id="_sdRX8OyNEeywTbjfxGsLDg" vpId="org.polarsys.capella.core.viewpoint" version="6.1.0"/>
</metadata:Metadata>
2 changes: 1 addition & 1 deletion tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.capella
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--Capella_Version_6.0.0-->
<!--Capella_Version_6.1.0-->
<org.polarsys.capella.core.data.capellamodeller:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/6.0.0"
xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/6.0.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/org.polarsys.capella.docgen.test.ju/model/ImagesLib/ImagesLib.afm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?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="_zYyYkOyNEeywTbjfxGsLDg">
<viewpointReferences id="_zZMBMOyNEeywTbjfxGsLDg" vpId="org.polarsys.capella.core.viewpoint" version="6.0.0"/>
<viewpointReferences id="_zZMBMOyNEeywTbjfxGsLDg" vpId="org.polarsys.capella.core.viewpoint" version="6.1.0"/>
</metadata:Metadata>
2 changes: 1 addition & 1 deletion tests/plugins/org.polarsys.capella.docgen.test.ju/model/ImagesLib/ImagesLib.capella
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--Capella_Version_6.0.0-->
<!--Capella_Version_6.1.0-->
<org.polarsys.capella.core.data.capellamodeller:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/6.0.0"
xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/6.0.0"
Expand Down
2 changes: 1 addition & 1 deletion ...plugins/org.polarsys.capella.docgen.test.ju/model/doc_configuration/doc_configuration.afm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?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="_JgbeMPhMEeyluaKuijWwMg">
<viewpointReferences id="_JhFlgPhMEeyluaKuijWwMg" vpId="org.polarsys.capella.core.viewpoint" version="6.0.0"/>
<viewpointReferences id="_JhFlgPhMEeyluaKuijWwMg" vpId="org.polarsys.capella.core.viewpoint" version="6.1.0"/>
</metadata:Metadata>
2 changes: 1 addition & 1 deletion ...ins/org.polarsys.capella.docgen.test.ju/model/doc_configuration/doc_configuration.capella
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--Capella_Version_6.0.0-->
<!--Capella_Version_6.1.0-->
<org.polarsys.capella.core.data.capellamodeller:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/6.0.0"
xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/6.0.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/org.polarsys.capella.docgen.test.ju/model/empty/empty.afm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?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="_r_6YcPFtEeyE1NbKWNPXGw">
<viewpointReferences id="_sAUBEPFtEeyE1NbKWNPXGw" vpId="org.polarsys.capella.core.viewpoint" version="6.0.0"/>
<viewpointReferences id="_sAUBEPFtEeyE1NbKWNPXGw" vpId="org.polarsys.capella.core.viewpoint" version="6.1.0"/>
</metadata:Metadata>
2 changes: 1 addition & 1 deletion tests/plugins/org.polarsys.capella.docgen.test.ju/model/empty/empty.capella
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--Capella_Version_6.0.0-->
<!--Capella_Version_6.1.0-->
<org.polarsys.capella.core.data.capellamodeller:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/6.0.0"
xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/6.0.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/org.polarsys.capella.docgen.test.ju/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.docgen.tests.plugins</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.polarsys</groupId>
<artifactId>org.polarsys.capella.addon.docgen</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down

0 comments on commit e676e7e

Please sign in to comment.