Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f2a60d0d by Tony CHEMIT at 2017-12-22T01:10:04+01:00 improve poms - - - - - 2 changed files: - services-client/pom.xml - services-local/pom.xml Changes: ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -21,7 +21,8 @@ #L% --> -<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"> +<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> <parent> @@ -149,56 +150,82 @@ <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>io.ultreia.java4all.http</groupId> + <artifactId>http-maven-plugin</artifactId> + <configuration> + <packageName>fr.ird.observe.services.client</packageName> + <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> + <serviceSupportType>fr.ird.observe.services.client.ObserveServiceClientSupport</serviceSupportType> + <gsonType>fr.ird.observe.dto.ObserveDto</gsonType> + <addAuthToken>true</addAuthToken> + <classSuffix>Client</classSuffix> + </configuration> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-maven-plugin</artifactId> <executions> <execution> - <id>generate-rest-client</id> + <id>default-generate-class-mapping</id> <goals> - <goal>generate-client</goal> <goal>generate-class-mapping</goal> </goals> - <configuration> - <packageName>fr.ird.observe.services.client</packageName> - <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> - <serviceSupportType>fr.ird.observe.services.client.ObserveServiceClientSupport</serviceSupportType> - <gsonType>fr.ird.observe.dto.ObserveDto</gsonType> - <addAuthToken>true</addAuthToken> - <classSuffix>Client</classSuffix> - </configuration> </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.ultreia.java4all</groupId> - <artifactId>java-lang</artifactId> - <version>${lib.version.java4all.java-lang}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> <execution> - <id>run-services-test</id> + <id>default-generate-client</id> <goals> - <goal>test</goal> + <goal>generate-client</goal> </goals> - <configuration> - <test>fr.ird.observe.services.client.ServiceClientTestSuite</test> - </configuration> </execution> </executions> </plugin> - </plugins> </build> + + <profiles> + <profile> + <id>run-services-test</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>run-services-test</id> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>${skipITs}</skip> + <test>fr.ird.observe.services.client.ServiceClientTestSuite</test> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -195,6 +195,29 @@ <build> + <pluginManagement> + <plugins> + + <plugin> + <groupId>io.ultreia.java4all.http</groupId> + <artifactId>http-maven-plugin</artifactId> + <configuration> + <packageName>fr.ird.observe.services.local</packageName> + <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> + <serviceSupportType>fr.ird.observe.services.local.service.ObserveServiceLocal</serviceSupportType> + <classSuffix>Local</classSuffix> + </configuration> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> <plugins> <plugin> @@ -202,25 +225,12 @@ <artifactId>http-maven-plugin</artifactId> <executions> <execution> - <id>generate-class-mapping-local</id> + <id>default-generate-class-mapping</id> <goals> <goal>generate-class-mapping</goal> </goals> - <configuration> - <packageName>fr.ird.observe.services.local</packageName> - <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> - <serviceSupportType>fr.ird.observe.services.local.service.ObserveServiceLocal</serviceSupportType> - <classSuffix>Local</classSuffix> - </configuration> </execution> </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> </plugin> </plugins> @@ -294,8 +304,8 @@ <id>run-services-test</id> <activation> <property> - <name>skipITs</name> - <value>!true</value> + <name>performRelease</name> + <value>true</value> </property> </activation> <build> @@ -310,6 +320,7 @@ <goal>test</goal> </goals> <configuration> + <skip>${skipITs}</skip> <test>fr.ird.observe.services.local.ServiceLocalTestSuite</test> </configuration> </execution> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f2a60d0da6992eca44f639f1701e... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f2a60d0da6992eca44f639f1701e... You're receiving this email because of your account on gitlab.com.