Skip to content

Commit

Permalink
[releng] Bump to 0.14.1
Browse files Browse the repository at this point in the history
Change-Id: I35f291dbb62c9f15e764c17a1da59d2dfa84aede
Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
  • Loading branch information
pdulth committed Nov 30, 2022
1 parent f0f138a commit e3b14f7
Show file tree
Hide file tree
Showing 37 changed files with 41 additions and 41 deletions.
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: Bridge Mapping Capella Scopes
Bundle-SymbolicName: org.eclipse.emf.diffmerge.bridge.capella.integration
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.capella.integration.internal.Activator
Require-Bundle: org.eclipse.emf.diffmerge.bridge.interactive,
org.eclipse.emf.diffmerge.bridge.mapping,
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.eclipse.emf.diffmerge.bridge.examples.apa.gen.edit;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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.eclipse.emf.diffmerge.bridge.examples.apa.gen.editor;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.examples.apa.presentation.ApaEditorPlugin$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.eclipse.emf.diffmerge.bridge.examples.apa.gen;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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: Bridge APA Example
Bundle-SymbolicName: org.eclipse.emf.diffmerge.bridge.examples.apa;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.examples.apa.APAExampleActivator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion core/examples/apa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.core.examples</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<!-- <module>org.eclipse.emf.diffmerge.bridge.capella.integration</module> -->
Expand Down
2 changes: 1 addition & 1 deletion core/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.core</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<!-- <module>uml</module> -->
Expand Down
2 changes: 1 addition & 1 deletion core/examples/uml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.core.examples</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<module>org.eclipse.emf.diffmerge.bridge.examples.uml.modular</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.coevolution.sdk.feature"
label="%featureName"
version="0.14.0.qualifier"
version="0.14.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.v20181016-2210">
Expand Down
2 changes: 1 addition & 1 deletion core/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.core</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>

<build>
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.eclipse.emf.diffmerge.bridge.incremental
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.incremental.IncrementalBridgePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.diffmerge.bridge;visibility:=reexport,
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.eclipse.emf.diffmerge.bridge.interactive
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.interactive.InteractiveBridgePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
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.eclipse.emf.diffmerge.bridge.log4j;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %providerName
Bundle-ClassPath: .
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.eclipse.emf.diffmerge.bridge.mapping
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.mapping.MappingBridgePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.diffmerge.bridge;visibility:=reexport
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.eclipse.emf.diffmerge.bridge.traces.gen.edit;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.traces.gen.bridgetraces.provider.BridgeTracesEditPlugin$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.eclipse.emf.diffmerge.bridge.traces.gen.editor;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.traces.gen.bridgetraces.presentation.BridgeTracesEditorPlugin$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.eclipse.emf.diffmerge.bridge.traces.gen;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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.eclipse.emf.diffmerge.bridge.uml
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.uml.UMLBridgePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.diffmerge.bridge.mapping;visibility:=reexport,
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.eclipse.emf.diffmerge.bridge
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.BridgePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.diffmerge;visibility:=reexport,
Expand Down
2 changes: 1 addition & 1 deletion core/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.core</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.root</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<module>plugins</module>
Expand Down
2 changes: 1 addition & 1 deletion integrations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.root</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<module>transposer</module>
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: Transposer Integration Example Plug-In (Incubation)
Bundle-SymbolicName: org.eclipse.emf.diffmerge.bridge.examples.apa.transposer.integrated;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.examples.apa.transposer.integrated.TransposerIntegrationApaPlugin
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.ui,
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: Transposer Example Plug-In (Incubation)
Bundle-SymbolicName: org.eclipse.emf.diffmerge.bridge.examples.apa.transposer;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.examples.apa.transposer.TransposerApaPlugin
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion integrations/transposer/examples/apa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.integrations.transposer.examples</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<module>org.eclipse.emf.diffmerge.bridge.examples.apa.transposer</module>
Expand Down
2 changes: 1 addition & 1 deletion integrations/transposer/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.integrations.transposer</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<module>apa</module>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.diffmerge.bridge.integration.transposer
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.bridge.integration.transposer.TransposerBridgePlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion integrations/transposer/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.integrations.transposer</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<module>org.eclipse.emf.diffmerge.bridge.integration.transposer</module>
Expand Down
2 changes: 1 addition & 1 deletion integrations/transposer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.integrations</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
<modules>
<module>plugins</module>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.configuration</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<relativePath>./releng/org.eclipse.emf.diffmerge.coevolution.configuration</relativePath>
</parent>
<modules>
<module>core</module>
<module>integrations</module>
<module>releng</module>
</modules>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.configuration</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -45,7 +45,7 @@
<artifact>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.target</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</artifact>
</target>
<includePackedArtifacts>true</includePackedArtifacts>
Expand Down
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: Javadoc for Co-Evolution Core (Incubation)
Bundle-SymbolicName: org.eclipse.emf.diffmerge.coevolution.javadoc
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.emf.diffmerge.coevolution.javadoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.releng</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.releng</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
</project>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.eclipse.emf.diffmerge.coevolution.sdk.feature_0.14.0.qualifier.jar" id="org.eclipse.emf.diffmerge.coevolution.sdk.feature" version="0.14.0.qualifier">
<feature url="features/org.eclipse.emf.diffmerge.coevolution.sdk.feature_0.14.1.qualifier.jar" id="org.eclipse.emf.diffmerge.coevolution.sdk.feature" version="0.14.1.qualifier">
<category name="org.eclipse.emf.diffmerge.coevolution.category"/>
</feature>
<feature url="features/org.eclipse.emf.diffmerge.coevolution.sdk.feature.source_0.14.0.qualifier.jar" id="org.eclipse.emf.diffmerge.coevolution.sdk.feature.source" version="0.14.0.qualifier">
<feature url="features/org.eclipse.emf.diffmerge.coevolution.sdk.feature.source_0.14.1.qualifier.jar" id="org.eclipse.emf.diffmerge.coevolution.sdk.feature.source" version="0.14.1.qualifier">
<category name="org.eclipse.emf.diffmerge.coevolution.category"/>
</feature>
<category-def name="org.eclipse.emf.diffmerge.coevolution.category" label="EMF Diff/Merge Model Co-Evolution (Incubation)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.releng</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
</parent>
</project>
4 changes: 2 additions & 2 deletions releng/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.releng</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.coevolution.configuration</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<relativePath>./org.eclipse.emf.diffmerge.coevolution.configuration</relativePath>
</parent>
<modules>
Expand Down

0 comments on commit e3b14f7

Please sign in to comment.