Commit 8000567c authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '22-add-a-pom-xml-in-developer-maven' into 'master'

Resolve "add a pom.xml in developer.maven"

Closes #22

See merge request RiseClipseGroup/RiseClipseDeveloper!27
parents 1fbd4871 3c519603
...@@ -6,23 +6,25 @@ ...@@ -6,23 +6,25 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>fr.centralesupelec.edf.riseclipse</groupId> <groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.developer.maven-all</artifactId> <artifactId>fr.centralesupelec.edf.riseclipse.developer.maven.all</artifactId>
<version>1.0.2-SNAPSHOT</version> <version>1.0.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId> <groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.developer.maven-root</artifactId> <artifactId>fr.centralesupelec.edf.riseclipse.developer.maven</artifactId>
<version>1.0.2-SNAPSHOT</version> <version>1.0.3-SNAPSHOT</version>
<relativePath>./pom-root.xml</relativePath> <relativePath>../fr.centralesupelec.edf.riseclipse.developer.maven/pom.xml</relativePath>
</parent> </parent>
<modules> <modules>
<module>../../RiseClipseDeveloper</module>
<module>../../RiseClipseMain</module> <module>../../RiseClipseMain</module>
<module>../../RiseClipseEditor</module> <module>../../RiseClipseEditor</module>
<module>../../RiseClipseMetamodel_SCL2003</module> <module>../../RiseClipseMetamodel_SCL2003</module>
<module>../../RiseClipseMetamodel_Cim</module> <module>../../RiseClipseMetamodel_Cim</module>
<module>../../RiseClipseMetamodel_Cim16</module> <module>../../RiseClipseMetamodel_Cim16</module>
<module>../../RiseClipseMetamodel_EntsoeCim16</module>
<module>../../RiseClipseMetamodel_Cim17</module> <module>../../RiseClipseMetamodel_Cim17</module>
<module>../../RiseClipseMetamodel_iec61970cim17</module> <module>../../RiseClipseMetamodel_iec61970cim17</module>
<module>../../RiseClipseMetamodel_iec61970cim17_iec61968cim13</module> <module>../../RiseClipseMetamodel_iec61970cim17_iec61968cim13</module>
...@@ -39,14 +41,9 @@ ...@@ -39,14 +41,9 @@
The ANTLR runtime 3.2.0 must also be installed by hand in the local .m2 repository The ANTLR runtime 3.2.0 must also be installed by hand in the local .m2 repository
using the provided org.antlr.runtime-3.2.0.zip (unzip it in ~/.m2/repository/ using the provided org.antlr.runtime-3.2.0.zip (unzip it in ~/.m2/repository/
replacing the 4.0.0 version) replacing the 4.0.0 version)
And the root POM file must be installed with the folowing command:
mvn install:install-file -Dfile=pom-root.xml \
-DgroupId=fr.centralesupelec.edf.riseclipse \
-DartifactId=fr.centralesupelec.edf.riseclipse.developer.maven-root \
-Dversion=1.0.0 -Dpackaging=pom
--> -->
<module>../../RiseClipseOCLValidator_SCL2003</module> <module>../../RiseClipseOCLValidator_SCL2003</module>
<module>../../RiseClipseOCLValidator_EntsoeCim16</module>
</modules> </modules>
</project> </project>
...@@ -6,20 +6,12 @@ ...@@ -6,20 +6,12 @@
<!-- <!--
This is the root POM for RiseClipse. This is the root POM for RiseClipse.
All common properties should be defined here. All common properties should be defined here.
To build/install standalone tools, it must be installed with maven using the following command:
mvn install:install-file -Dfile=pom-root.xml \
-DgroupId=fr.centralesupelec.edf.riseclipse \
-DartifactId=fr.centralesupelec.edf.riseclipse.developer.maven-root \
-Dversion=1.0.0 -Dpackaging=pom
To build/deploy standalone tools, it must be deployed using the appropriate command.
--> -->
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>fr.centralesupelec.edf.riseclipse</groupId> <groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.developer.maven-root</artifactId> <artifactId>fr.centralesupelec.edf.riseclipse.developer.maven</artifactId>
<version>1.0.3-SNAPSHOT</version> <version>1.0.3-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
...@@ -30,7 +22,7 @@ ...@@ -30,7 +22,7 @@
<tycho-version>1.1.0</tycho-version> <tycho-version>1.1.0</tycho-version>
<unleash-maven-version>2.8.0</unleash-maven-version> <unleash-maven-plugin-version>2.8.0</unleash-maven-plugin-version>
<unleash-scm-provider-git-version>2.1.0</unleash-scm-provider-git-version> <unleash-scm-provider-git-version>2.1.0</unleash-scm-provider-git-version>
<eclipse-equinox-version>1.3.400</eclipse-equinox-version> <eclipse-equinox-version>1.3.400</eclipse-equinox-version>
...@@ -83,7 +75,7 @@ ...@@ -83,7 +75,7 @@
<!-- It is prefered over the standard release maven plugin --> <!-- It is prefered over the standard release maven plugin -->
<groupId>com.itemis.maven.plugins</groupId> <groupId>com.itemis.maven.plugins</groupId>
<artifactId>unleash-maven-plugin</artifactId> <artifactId>unleash-maven-plugin</artifactId>
<version>${unleash-maven-version}</version> <version>${unleash-maven-plugin-version}</version>
<configuration> <configuration>
<tagNamePattern>v@{project.version}</tagNamePattern> <tagNamePattern>v@{project.version}</tagNamePattern>
<commitBeforeTagging>true</commitBeforeTagging> <commitBeforeTagging>true</commitBeforeTagging>
...@@ -186,6 +178,30 @@ ...@@ -186,6 +178,30 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
</plugins>
</build> </build>
</project> </project>
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
<parent> <parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId> <groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.developer.maven-root</artifactId> <artifactId>fr.centralesupelec.edf.riseclipse.developer.maven</artifactId>
<version>1.0.2</version> <version>1.0.3-SNAPSHOT</version>
<relativePath>fr.centralesupelec.edf.riseclipse.developer.maven/pom-root.xml</relativePath> <relativePath>fr.centralesupelec.edf.riseclipse.developer.maven/pom.xml</relativePath>
</parent> </parent>
<scm> <scm>
...@@ -23,39 +23,12 @@ ...@@ -23,39 +23,12 @@
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
</plugins>
</build>
<modules> <modules>
<!-- Have to find a way to install/deploy pom-root --> <module>fr.centralesupelec.edf.riseclipse.developer.maven</module>
<!--module>fr.centralesupelec.edf.riseclipse.developer.maven</module--> <!--module>fr.centralesupelec.edf.riseclipse.feature.all</module>
<module>fr.centralesupelec.edf.riseclipse.feature.all</module>
<module>fr.centralesupelec.edf.riseclipse.feature.editor</module> <module>fr.centralesupelec.edf.riseclipse.feature.editor</module>
<module>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl</module> <module>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl</module>
<module>fr.centralesupelec.edf.riseclipse.update-site</module> <module>fr.centralesupelec.edf.riseclipse.update-site</module-->
</modules> </modules>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment