From e676e7e34a38a24a725398414ade114acf050e50 Mon Sep 17 00:00:00 2001 From: Philippe DUL Date: Fri, 21 Oct 2022 09:04:34 +0200 Subject: [PATCH] [releng] Bump to 6.1 (#225) * [releng] Bump to 6.1 Change-Id: I2b6721277d682932e2ea283ae5e620969fc977bd Signed-off-by: Philippe DUL * [releng] Update target platform to Kitalpha nightly Signed-off-by: Philippe DUL --- .../feature.xml | 2 +- .../features/org.polarsys.capella.docgen.feature/feature.xml | 2 +- .../org.polarsys.capella.docgen.package.feature/feature.xml | 2 +- docgenhtml/features/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.polarsys.capella.docgen.doc/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.polarsys.capella.docgen.ui/META-INF/MANIFEST.MF | 2 +- .../plugins/org.polarsys.capella.docgen/META-INF/MANIFEST.MF | 2 +- docgenhtml/plugins/pom.xml | 2 +- pom.xml | 4 ++-- releng/org.polarsys.capella.docgen.site/category.xml | 4 ++-- releng/org.polarsys.capella.docgen.site/pom.xml | 2 +- releng/org.polarsys.capella.docgen.target/pom.xml | 2 +- .../tp/capella.target-definition.targetplatform | 2 +- .../org.polarsys.capella.docgen.test.ju/META-INF/MANIFEST.MF | 2 +- .../model/Images/Images.afm | 2 +- .../model/Images/Images.capella | 2 +- .../model/ImagesLib/ImagesLib.afm | 2 +- .../model/ImagesLib/ImagesLib.capella | 2 +- .../model/doc_configuration/doc_configuration.afm | 2 +- .../model/doc_configuration/doc_configuration.capella | 2 +- .../org.polarsys.capella.docgen.test.ju/model/empty/empty.afm | 2 +- .../model/empty/empty.capella | 2 +- tests/plugins/org.polarsys.capella.docgen.test.ju/pom.xml | 2 +- tests/plugins/pom.xml | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docgenhtml/features/org.polarsys.capella.docgen.configuration.feature/feature.xml b/docgenhtml/features/org.polarsys.capella.docgen.configuration.feature/feature.xml index c99e6f64..8382c592 100644 --- a/docgenhtml/features/org.polarsys.capella.docgen.configuration.feature/feature.xml +++ b/docgenhtml/features/org.polarsys.capella.docgen.configuration.feature/feature.xml @@ -13,7 +13,7 @@ Contributors: diff --git a/docgenhtml/features/org.polarsys.capella.docgen.feature/feature.xml b/docgenhtml/features/org.polarsys.capella.docgen.feature/feature.xml index 96e85e88..9e45aa97 100644 --- a/docgenhtml/features/org.polarsys.capella.docgen.feature/feature.xml +++ b/docgenhtml/features/org.polarsys.capella.docgen.feature/feature.xml @@ -13,7 +13,7 @@ Contributors: diff --git a/docgenhtml/features/org.polarsys.capella.docgen.package.feature/feature.xml b/docgenhtml/features/org.polarsys.capella.docgen.package.feature/feature.xml index 3ca6660c..e4d5f693 100644 --- a/docgenhtml/features/org.polarsys.capella.docgen.package.feature/feature.xml +++ b/docgenhtml/features/org.polarsys.capella.docgen.package.feature/feature.xml @@ -13,7 +13,7 @@ Contributors: diff --git a/docgenhtml/features/pom.xml b/docgenhtml/features/pom.xml index cd1918fb..194ae50c 100644 --- a/docgenhtml/features/pom.xml +++ b/docgenhtml/features/pom.xml @@ -23,7 +23,7 @@ org.polarsys org.polarsys.capella.addon.docgen - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT ../../ diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.commandline/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.commandline/META-INF/MANIFEST.MF index 0aeb4988..8d55588e 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.commandline/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.commandline/META-INF/MANIFEST.MF @@ -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, diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.commandline/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.commandline/META-INF/MANIFEST.MF index 093882e9..f2706d9a 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.commandline/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.commandline/META-INF/MANIFEST.MF @@ -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 diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.edit/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.edit/META-INF/MANIFEST.MF index 0e730303..548c58d2 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.edit/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.edit/META-INF/MANIFEST.MF @@ -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 diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.editor/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.editor/META-INF/MANIFEST.MF index f1c0f8d5..3a815b42 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.editor/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.editor/META-INF/MANIFEST.MF @@ -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 diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.ui/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.ui/META-INF/MANIFEST.MF index 46f152be..a3f3b133 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.ui/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration.ui/META-INF/MANIFEST.MF @@ -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 diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration/META-INF/MANIFEST.MF index 6823fc9b..10702fbe 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.configuration/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.configuration/META-INF/MANIFEST.MF @@ -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 diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.doc/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.doc/META-INF/MANIFEST.MF index f8cb0709..98c64fd8 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.doc/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.doc/META-INF/MANIFEST.MF @@ -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, diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.preference/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.preference/META-INF/MANIFEST.MF index 0f5cbe1f..465627c8 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.preference/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.preference/META-INF/MANIFEST.MF @@ -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, diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen.ui/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen.ui/META-INF/MANIFEST.MF index 76128093..0e5bb037 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen.ui/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen.ui/META-INF/MANIFEST.MF @@ -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, diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen/META-INF/MANIFEST.MF b/docgenhtml/plugins/org.polarsys.capella.docgen/META-INF/MANIFEST.MF index af5321c2..526b78b3 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen/META-INF/MANIFEST.MF +++ b/docgenhtml/plugins/org.polarsys.capella.docgen/META-INF/MANIFEST.MF @@ -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, diff --git a/docgenhtml/plugins/pom.xml b/docgenhtml/plugins/pom.xml index cdae7fa7..a6a308cf 100644 --- a/docgenhtml/plugins/pom.xml +++ b/docgenhtml/plugins/pom.xml @@ -23,7 +23,7 @@ org.polarsys org.polarsys.capella.addon.docgen - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT ../../ diff --git a/pom.xml b/pom.xml index b226498c..b74fcc35 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ Capella XHTML DocGen Add-on org.polarsys org.polarsys.capella.addon.docgen - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT pom @@ -149,7 +149,7 @@ org.polarsys org.polarsys.capella.addon.docgen - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT releng/org.polarsys.capella.docgen.target/tp/capella.target-definition diff --git a/releng/org.polarsys.capella.docgen.site/category.xml b/releng/org.polarsys.capella.docgen.site/category.xml index d4996406..bb109472 100644 --- a/releng/org.polarsys.capella.docgen.site/category.xml +++ b/releng/org.polarsys.capella.docgen.site/category.xml @@ -14,10 +14,10 @@ Capella XHTML DocGen Add-on - + - + diff --git a/releng/org.polarsys.capella.docgen.site/pom.xml b/releng/org.polarsys.capella.docgen.site/pom.xml index a18aec5e..349e31c8 100644 --- a/releng/org.polarsys.capella.docgen.site/pom.xml +++ b/releng/org.polarsys.capella.docgen.site/pom.xml @@ -17,7 +17,7 @@ org.polarsys org.polarsys.capella.addon.docgen - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT ../../ diff --git a/releng/org.polarsys.capella.docgen.target/pom.xml b/releng/org.polarsys.capella.docgen.target/pom.xml index bd86b05a..e1e947e4 100644 --- a/releng/org.polarsys.capella.docgen.target/pom.xml +++ b/releng/org.polarsys.capella.docgen.target/pom.xml @@ -16,7 +16,7 @@ org.polarsys capella.target-definition - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT pom diff --git a/releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform b/releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform index d26a553e..618f5829 100644 --- a/releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform +++ b/releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform @@ -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 } diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/META-INF/MANIFEST.MF b/tests/plugins/org.polarsys.capella.docgen.test.ju/META-INF/MANIFEST.MF index 5ede2075..41f3875b 100644 --- a/tests/plugins/org.polarsys.capella.docgen.test.ju/META-INF/MANIFEST.MF +++ b/tests/plugins/org.polarsys.capella.docgen.test.ju/META-INF/MANIFEST.MF @@ -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", diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.afm b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.afm index f9cc6ad7..bead5e1f 100644 --- a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.afm +++ b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.afm @@ -1,4 +1,4 @@ - + diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.capella b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.capella index cff06451..0a938d31 100644 --- a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.capella +++ b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/Images/Images.capella @@ -1,6 +1,6 @@ - + - + diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/ImagesLib/ImagesLib.capella b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/ImagesLib/ImagesLib.capella index ff3b4bb6..0890807c 100644 --- a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/ImagesLib/ImagesLib.capella +++ b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/ImagesLib/ImagesLib.capella @@ -1,6 +1,6 @@ - + - + diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/doc_configuration/doc_configuration.capella b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/doc_configuration/doc_configuration.capella index 4075f391..326f86e1 100644 --- a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/doc_configuration/doc_configuration.capella +++ b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/doc_configuration/doc_configuration.capella @@ -1,6 +1,6 @@ - + - + diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/empty/empty.capella b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/empty/empty.capella index b18c800f..2f31c695 100644 --- a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/empty/empty.capella +++ b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/empty/empty.capella @@ -1,6 +1,6 @@ - + org.polarsys org.polarsys.capella.addon.docgen.tests.plugins - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT ../ diff --git a/tests/plugins/pom.xml b/tests/plugins/pom.xml index feb49823..dadbd919 100644 --- a/tests/plugins/pom.xml +++ b/tests/plugins/pom.xml @@ -23,7 +23,7 @@ org.polarsys org.polarsys.capella.addon.docgen - 6.0.0-SNAPSHOT + 6.1.0-SNAPSHOT ../../