diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/META-INF/MANIFEST.MF index fe5c7358867e1aac573675829afc07d41528d473..7d4ce738f8fdbdc31e79909a509866c40b6bfab9 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: RiseClipse CIM Header Edit Support Bundle-Vendor: CentraleSupélec & EDF Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.cim.headerModel.edit;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/pom.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/pom.xml index ebd94a95296a39498a2153f6a5878150f27a5ff8..c3a250489c8f4bac1c5d59a896fd848037b02a28 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/pom.xml +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/pom.xml @@ -1,19 +1,39 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>fr.centralesupelec.edf.riseclipse</groupId> <artifactId>fr.centralesupelec.edf.riseclipse.cim.headerModel.edit</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> <groupId>fr.centralesupelec.edf.riseclipse</groupId> <artifactId>RiseClipseMetamodel_Cim</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> </parent> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <!-- This needed parameter seems to be ignored if put in the pom root file --> + <pomDependencies>consider</pomDependencies> + </configuration> + </plugin> + </plugins> + </build> + + <!-- RiseClipse plugins needed --> + <dependencies> + <dependency> + <groupId>fr.centralesupelec.edf.riseclipse</groupId> + <artifactId>fr.centralesupelec.edf.riseclipse.cim.headerModel</artifactId> + <version>1.0.1-SNAPSHOT</version> + </dependency> + </dependencies> + </project> diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.cim.headerModel/META-INF/MANIFEST.MF index a6bb229a276e90aa05e7f42b1a0a5ac7bb735cf6..d78fefae0a03d029848c6b7945adc46bff09a9ff 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: RiseClipse CIM Header Metamodel Bundle-Vendor: CentraleSupélec & EDF Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.cim.headerModel;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/pom.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel/pom.xml index 5bfd48452e1596e9304f35aac5ec6e11ba644e25..6359e1d1ff08ffcd77712d028964389879a1ae26 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/pom.xml +++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/pom.xml @@ -1,19 +1,39 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>fr.centralesupelec.edf.riseclipse</groupId> <artifactId>fr.centralesupelec.edf.riseclipse.cim.headerModel</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> <groupId>fr.centralesupelec.edf.riseclipse</groupId> <artifactId>RiseClipseMetamodel_Cim</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> </parent> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <!-- This needed parameter seems to be ignored if put in the pom root file --> + <pomDependencies>consider</pomDependencies> + </configuration> + </plugin> + </plugins> + </build> + + <!-- RiseClipse plugins needed --> + <dependencies> + <dependency> + <groupId>fr.centralesupelec.edf.riseclipse</groupId> + <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId> + <version>1.0.1</version> + </dependency> + </dependencies> + </project> diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.cim.util/META-INF/MANIFEST.MF index be35161286c2f68a59f40e7745b5d0d5696338c7..e3794036c1c1778b6286e004edf5bcc0fd430a17 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.util/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.cim.util/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: RiseClipse CIM Utilities Bundle-Vendor: CentraleSupélec & EDF Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.cim.util;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.emf.ecore, diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/pom.xml b/fr.centralesupelec.edf.riseclipse.cim.util/pom.xml index 8669b6ab5ffaa7fc550e8bf4c148ff440ad75783..48e16b83cf38b4f5311970b73df8fad0d433486b 100644 --- a/fr.centralesupelec.edf.riseclipse.cim.util/pom.xml +++ b/fr.centralesupelec.edf.riseclipse.cim.util/pom.xml @@ -1,19 +1,39 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>fr.centralesupelec.edf.riseclipse</groupId> <artifactId>fr.centralesupelec.edf.riseclipse.cim.util</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <parent> <groupId>fr.centralesupelec.edf.riseclipse</groupId> <artifactId>RiseClipseMetamodel_Cim</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> </parent> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <!-- This needed parameter seems to be ignored if put in the pom root file --> + <pomDependencies>consider</pomDependencies> + </configuration> + </plugin> + </plugins> + </build> + + <!-- RiseClipse plugins needed --> + <dependencies> + <dependency> + <groupId>fr.centralesupelec.edf.riseclipse</groupId> + <artifactId>fr.centralesupelec.edf.riseclipse.cim.headerModel</artifactId> + <version>1.0.1-SNAPSHOT</version> + </dependency> + </dependencies> + </project> diff --git a/pom.xml b/pom.xml index df326d5170445fc2fee3ff47d8f84abdaf0de1dd..9748ca0e89b2612d3826081afee97d7cc0034bee 100644 --- a/pom.xml +++ b/pom.xml @@ -1,22 +1,25 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>fr.centralesupelec.edf.riseclipse</groupId> <artifactId>RiseClipseMetamodel_Cim</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <packaging>pom</packaging> <parent> <groupId>fr.centralesupelec.edf.riseclipse</groupId> - <artifactId>fr.centralesupelec.edf.riseclipse.developer.maven-root</artifactId> - <version>1.0.1</version> - <relativePath>../RiseClipseDeveloper/fr.centralesupelec.edf.riseclipse.developer.maven/pom-root.xml</relativePath> + <artifactId>fr.centralesupelec.edf.riseclipse.developer.maven</artifactId> + <version>1.0.4</version> + <relativePath>../RiseClipseDeveloper/fr.centralesupelec.edf.riseclipse.developer.maven/pom.xml</relativePath> </parent> + <scm> + <connection>scm:git:git@gitlab.centralesupelec.fr:RiseClipseGroup/RiseClipseMetamodel_Cim.git</connection> + <developerConnection>scm:git:git@gitlab.centralesupelec.fr:RiseClipseGroup/RiseClipseMetamodel_Cim.git</developerConnection> + <tag>HEAD</tag> + </scm> + <modules> <module>fr.centralesupelec.edf.riseclipse.cim.headerModel</module> <module>fr.centralesupelec.edf.riseclipse.cim.headerModel.edit</module>