Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
f2a60d0d
by Tony CHEMIT at 2017-12-22T01:10:04+01:00
2 changed files:
Changes:
| ... | ... | @@ -21,7 +21,8 @@ |
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 | 23 |
|
| 24 |
-<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">
|
|
| 24 |
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
| 25 |
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
| 25 | 26 |
<modelVersion>4.0.0</modelVersion>
|
| 26 | 27 |
|
| 27 | 28 |
<parent>
|
| ... | ... | @@ -149,56 +150,82 @@ |
| 149 | 150 |
|
| 150 | 151 |
<build>
|
| 151 | 152 |
|
| 153 |
+ <pluginManagement>
|
|
| 154 |
+ <plugins>
|
|
| 155 |
+ <plugin>
|
|
| 156 |
+ <groupId>io.ultreia.java4all.http</groupId>
|
|
| 157 |
+ <artifactId>http-maven-plugin</artifactId>
|
|
| 158 |
+ <configuration>
|
|
| 159 |
+ <packageName>fr.ird.observe.services.client</packageName>
|
|
| 160 |
+ <serviceType>fr.ird.observe.services.service.ObserveService</serviceType>
|
|
| 161 |
+ <serviceSupportType>fr.ird.observe.services.client.ObserveServiceClientSupport</serviceSupportType>
|
|
| 162 |
+ <gsonType>fr.ird.observe.dto.ObserveDto</gsonType>
|
|
| 163 |
+ <addAuthToken>true</addAuthToken>
|
|
| 164 |
+ <classSuffix>Client</classSuffix>
|
|
| 165 |
+ </configuration>
|
|
| 166 |
+ <dependencies>
|
|
| 167 |
+ <dependency>
|
|
| 168 |
+ <groupId>${project.groupId}</groupId>
|
|
| 169 |
+ <artifactId>services</artifactId>
|
|
| 170 |
+ <version>${project.version}</version>
|
|
| 171 |
+ </dependency>
|
|
| 172 |
+ </dependencies>
|
|
| 173 |
+ </plugin>
|
|
| 174 |
+ </plugins>
|
|
| 175 |
+ </pluginManagement>
|
|
| 176 |
+ |
|
| 152 | 177 |
<plugins>
|
| 153 | 178 |
<plugin>
|
| 154 | 179 |
<groupId>io.ultreia.java4all.http</groupId>
|
| 155 | 180 |
<artifactId>http-maven-plugin</artifactId>
|
| 156 | 181 |
<executions>
|
| 157 | 182 |
<execution>
|
| 158 |
- <id>generate-rest-client</id>
|
|
| 183 |
+ <id>default-generate-class-mapping</id>
|
|
| 159 | 184 |
<goals>
|
| 160 |
- <goal>generate-client</goal>
|
|
| 161 | 185 |
<goal>generate-class-mapping</goal>
|
| 162 | 186 |
</goals>
|
| 163 |
- <configuration>
|
|
| 164 |
- <packageName>fr.ird.observe.services.client</packageName>
|
|
| 165 |
- <serviceType>fr.ird.observe.services.service.ObserveService</serviceType>
|
|
| 166 |
- <serviceSupportType>fr.ird.observe.services.client.ObserveServiceClientSupport</serviceSupportType>
|
|
| 167 |
- <gsonType>fr.ird.observe.dto.ObserveDto</gsonType>
|
|
| 168 |
- <addAuthToken>true</addAuthToken>
|
|
| 169 |
- <classSuffix>Client</classSuffix>
|
|
| 170 |
- </configuration>
|
|
| 171 | 187 |
</execution>
|
| 172 |
- </executions>
|
|
| 173 |
- <dependencies>
|
|
| 174 |
- <dependency>
|
|
| 175 |
- <groupId>${project.groupId}</groupId>
|
|
| 176 |
- <artifactId>services</artifactId>
|
|
| 177 |
- <version>${project.version}</version>
|
|
| 178 |
- </dependency>
|
|
| 179 |
- <dependency>
|
|
| 180 |
- <groupId>io.ultreia.java4all</groupId>
|
|
| 181 |
- <artifactId>java-lang</artifactId>
|
|
| 182 |
- <version>${lib.version.java4all.java-lang}</version>
|
|
| 183 |
- </dependency>
|
|
| 184 |
- </dependencies>
|
|
| 185 |
- </plugin>
|
|
| 186 |
- |
|
| 187 |
- <plugin>
|
|
| 188 |
- <artifactId>maven-surefire-plugin</artifactId>
|
|
| 189 |
- <executions>
|
|
| 190 | 188 |
<execution>
|
| 191 |
- <id>run-services-test</id>
|
|
| 189 |
+ <id>default-generate-client</id>
|
|
| 192 | 190 |
<goals>
|
| 193 |
- <goal>test</goal>
|
|
| 191 |
+ <goal>generate-client</goal>
|
|
| 194 | 192 |
</goals>
|
| 195 |
- <configuration>
|
|
| 196 |
- <test>fr.ird.observe.services.client.ServiceClientTestSuite</test>
|
|
| 197 |
- </configuration>
|
|
| 198 | 193 |
</execution>
|
| 199 | 194 |
</executions>
|
| 200 | 195 |
</plugin>
|
| 201 |
- |
|
| 202 | 196 |
</plugins>
|
| 203 | 197 |
</build>
|
| 198 |
+ |
|
| 199 |
+ <profiles>
|
|
| 200 |
+ <profile>
|
|
| 201 |
+ <id>run-services-test</id>
|
|
| 202 |
+ <activation>
|
|
| 203 |
+ <property>
|
|
| 204 |
+ <name>performRelease</name>
|
|
| 205 |
+ <value>true</value>
|
|
| 206 |
+ </property>
|
|
| 207 |
+ </activation>
|
|
| 208 |
+ <build>
|
|
| 209 |
+ <defaultGoal>test</defaultGoal>
|
|
| 210 |
+ <plugins>
|
|
| 211 |
+ <plugin>
|
|
| 212 |
+ <artifactId>maven-surefire-plugin</artifactId>
|
|
| 213 |
+ <executions>
|
|
| 214 |
+ <execution>
|
|
| 215 |
+ <id>run-services-test</id>
|
|
| 216 |
+ <goals>
|
|
| 217 |
+ <goal>test</goal>
|
|
| 218 |
+ </goals>
|
|
| 219 |
+ <configuration>
|
|
| 220 |
+ <skip>${skipITs}</skip>
|
|
| 221 |
+ <test>fr.ird.observe.services.client.ServiceClientTestSuite</test>
|
|
| 222 |
+ </configuration>
|
|
| 223 |
+ </execution>
|
|
| 224 |
+ </executions>
|
|
| 225 |
+ </plugin>
|
|
| 226 |
+ </plugins>
|
|
| 227 |
+ </build>
|
|
| 228 |
+ </profile>
|
|
| 229 |
+ </profiles>
|
|
| 230 |
+ |
|
| 204 | 231 |
</project>
|
| ... | ... | @@ -195,6 +195,29 @@ |
| 195 | 195 |
|
| 196 | 196 |
<build>
|
| 197 | 197 |
|
| 198 |
+ <pluginManagement>
|
|
| 199 |
+ <plugins>
|
|
| 200 |
+ |
|
| 201 |
+ <plugin>
|
|
| 202 |
+ <groupId>io.ultreia.java4all.http</groupId>
|
|
| 203 |
+ <artifactId>http-maven-plugin</artifactId>
|
|
| 204 |
+ <configuration>
|
|
| 205 |
+ <packageName>fr.ird.observe.services.local</packageName>
|
|
| 206 |
+ <serviceType>fr.ird.observe.services.service.ObserveService</serviceType>
|
|
| 207 |
+ <serviceSupportType>fr.ird.observe.services.local.service.ObserveServiceLocal</serviceSupportType>
|
|
| 208 |
+ <classSuffix>Local</classSuffix>
|
|
| 209 |
+ </configuration>
|
|
| 210 |
+ <dependencies>
|
|
| 211 |
+ <dependency>
|
|
| 212 |
+ <groupId>${project.groupId}</groupId>
|
|
| 213 |
+ <artifactId>services</artifactId>
|
|
| 214 |
+ <version>${project.version}</version>
|
|
| 215 |
+ </dependency>
|
|
| 216 |
+ </dependencies>
|
|
| 217 |
+ </plugin>
|
|
| 218 |
+ |
|
| 219 |
+ </plugins>
|
|
| 220 |
+ </pluginManagement>
|
|
| 198 | 221 |
<plugins>
|
| 199 | 222 |
|
| 200 | 223 |
<plugin>
|
| ... | ... | @@ -202,25 +225,12 @@ |
| 202 | 225 |
<artifactId>http-maven-plugin</artifactId>
|
| 203 | 226 |
<executions>
|
| 204 | 227 |
<execution>
|
| 205 |
- <id>generate-class-mapping-local</id>
|
|
| 228 |
+ <id>default-generate-class-mapping</id>
|
|
| 206 | 229 |
<goals>
|
| 207 | 230 |
<goal>generate-class-mapping</goal>
|
| 208 | 231 |
</goals>
|
| 209 |
- <configuration>
|
|
| 210 |
- <packageName>fr.ird.observe.services.local</packageName>
|
|
| 211 |
- <serviceType>fr.ird.observe.services.service.ObserveService</serviceType>
|
|
| 212 |
- <serviceSupportType>fr.ird.observe.services.local.service.ObserveServiceLocal</serviceSupportType>
|
|
| 213 |
- <classSuffix>Local</classSuffix>
|
|
| 214 |
- </configuration>
|
|
| 215 | 232 |
</execution>
|
| 216 | 233 |
</executions>
|
| 217 |
- <dependencies>
|
|
| 218 |
- <dependency>
|
|
| 219 |
- <groupId>${project.groupId}</groupId>
|
|
| 220 |
- <artifactId>services</artifactId>
|
|
| 221 |
- <version>${project.version}</version>
|
|
| 222 |
- </dependency>
|
|
| 223 |
- </dependencies>
|
|
| 224 | 234 |
</plugin>
|
| 225 | 235 |
|
| 226 | 236 |
</plugins>
|
| ... | ... | @@ -294,8 +304,8 @@ |
| 294 | 304 |
<id>run-services-test</id>
|
| 295 | 305 |
<activation>
|
| 296 | 306 |
<property>
|
| 297 |
- <name>skipITs</name>
|
|
| 298 |
- <value>!true</value>
|
|
| 307 |
+ <name>performRelease</name>
|
|
| 308 |
+ <value>true</value>
|
|
| 299 | 309 |
</property>
|
| 300 | 310 |
</activation>
|
| 301 | 311 |
<build>
|
| ... | ... | @@ -310,6 +320,7 @@ |
| 310 | 320 |
<goal>test</goal>
|
| 311 | 321 |
</goals>
|
| 312 | 322 |
<configuration>
|
| 323 |
+ <skip>${skipITs}</skip>
|
|
| 313 | 324 |
<test>fr.ird.observe.services.local.ServiceLocalTestSuite</test>
|
| 314 | 325 |
</configuration>
|
| 315 | 326 |
</execution>
|