This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit dcf8ebd6b7cfe9941a1aa925cff70d5e27921fc3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 08:54:59 2015 +0200 passage sous git et utilisation de codelutinpom --- observe-business/pom.xml | 60 +------------------------ observe-entities/pom.xml | 108 +-------------------------------------------- observe-swing/pom.xml | 3 +- observe-validation/pom.xml | 4 +- 4 files changed, 7 insertions(+), 168 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 2237acd..35b6653 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -24,9 +24,7 @@ --> <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> -<!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> @@ -231,12 +229,6 @@ <build> <resources> <resource> - <directory>${maven.gen.dir}/resources</directory> - <includes> - <include>objectmodel/*.properties</include> - </includes> - </resource> - <resource> <directory>src/main/resources</directory> <includes> <include>**/*</include> @@ -261,59 +253,9 @@ <plugins> - <!--plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <configuration> - <defaultPackage>fr.ird.observe</defaultPackage> - <fullPackagePath>fr.ird.observe</fullPackagePath> - </configuration> - <executions> - <execution> - <phase>generate-sources</phase> - <id>generate-persistence</id> - <configuration> - <inputs> - <input>zargo:src/main/xmi:observe-common.zargo</input> - <input>zargo:src/main/xmi:observe-seine.zargo</input> - <input>zargo:src/main/xmi:observe-longline.zargo</input> - </inputs> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.topia.generator.BinderHelperTransformer - </templates> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin--> - <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> - <!--configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - <includes> - <param>**/*Abstract.java</param> - </includes> - <excludes> - <param>**/*DAOAbstract.java</param> - </excludes> - </entry> - </entries> - </configuration--> <executions> <execution> <goals> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 6340a40..c27538b 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -115,7 +115,7 @@ <build> <resources> <resource> - <directory>${maven.gen.dir}/resources</directory> + <directory>${project.build.directory}/generated-sources/resources/</directory> <includes> <include>objectmodel/*.properties</include> </includes> @@ -189,7 +189,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> <includes> <param>**/*Abstract.java</param> </includes> @@ -224,108 +224,4 @@ </plugins> </build> - <profiles> - - <profile> - <id>run-replication-its</id> - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration-report-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/replication/*IT.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>run-migration-its</id> - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration-report-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/migration/**/*IT.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>run-its</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/*IT.java</include> - </includes> - <excludes> - <exclude>**/RestoreEmptyPGIT.java</exclude> - <exclude>**/report/**/*IT.java</exclude> - </excludes> - </configuration> - </execution> - - <execution> - <id>after-integration-tests</id> - <phase>post-integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/RestoreEmptyPGIT.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - </profiles> </project> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index a2c1526..bc4d9ab 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -287,6 +287,7 @@ <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> @@ -321,7 +322,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 37887d0..375c1fb 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -116,7 +116,7 @@ <resources> <resource> - <directory>${maven.src.dir}/main/resources</directory> + <directory>${project.basedir}/src/main/resources</directory> <includes> <include>**/*</include> </includes> @@ -132,7 +132,7 @@ <entries> <entry> <specificGoal>parserValidation</specificGoal> - <basedir>${maven.src.dir}/main/resources/</basedir> + <basedir>${project.basedir}/src/main/resources/</basedir> <includes> <param>**/**-validation.xml</param> </includes> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.