Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • core/dto/pom.xml
    ... ... @@ -323,7 +323,7 @@
    323 323
                 </goals>
    
    324 324
                 <phase>generate-sources</phase>
    
    325 325
                 <configuration>
    
    326
    -              <templates>fr.ird.observe.toolkit.templates.spi.navigation.GenerateNavigation</templates>
    
    326
    +              <templates>fr.ird.observe.toolkit.templates.GenerateNavigation</templates>
    
    327 327
                   <defaultPackage>${model.persistence.defaultPackage}</defaultPackage>
    
    328 328
                   <fullPackagePath>${model.persistence.fullPackagePath}</fullPackagePath>
    
    329 329
                   <inputs>
    

  • core/services-impl/local/.mvn/models-dto deleted

  • core/services-impl/local/pom.xml
    ... ... @@ -29,7 +29,6 @@
    29 29
       <name>ObServe Core :: Services Impl :: Local</name>
    
    30 30
       <description>ObServe Core services local implementation module</description>
    
    31 31
       <properties>
    
    32
    -    <eugene.templates>fr.ird.observe.toolkit.templates.GenerateServiceLocal</eugene.templates>
    
    33 32
         <serviceClassifier>local</serviceClassifier>
    
    34 33
       </properties>
    
    35 34
       <dependencies>
    
    ... ... @@ -191,66 +190,6 @@
    191 190
         </dependency>
    
    192 191
       </dependencies>
    
    193 192
       <build>
    
    194
    -    <pluginManagement>
    
    195
    -      <plugins>
    
    196
    -        <plugin>
    
    197
    -          <groupId>io.ultreia.java4all.eugene</groupId>
    
    198
    -          <artifactId>eugene-maven-plugin</artifactId>
    
    199
    -          <dependencies>
    
    200
    -            <dependency>
    
    201
    -              <groupId>${project.groupId}</groupId>
    
    202
    -              <artifactId>core-services-api</artifactId>
    
    203
    -              <version>${project.version}</version>
    
    204
    -            </dependency>
    
    205
    -            <dependency>
    
    206
    -              <groupId>${project.groupId}</groupId>
    
    207
    -              <artifactId>core-services-provider</artifactId>
    
    208
    -              <version>${project.version}</version>
    
    209
    -            </dependency>
    
    210
    -            <dependency>
    
    211
    -              <groupId>${project.groupId}</groupId>
    
    212
    -              <artifactId>tests-api</artifactId>
    
    213
    -              <version>${project.version}</version>
    
    214
    -            </dependency>
    
    215
    -            <dependency>
    
    216
    -              <groupId>fr.ird.observe</groupId>
    
    217
    -              <artifactId>toolkit-config</artifactId>
    
    218
    -              <version>${lib.version.toolkit}</version>
    
    219
    -            </dependency>
    
    220
    -            <dependency>
    
    221
    -              <groupId>fr.ird.observe</groupId>
    
    222
    -              <artifactId>toolkit-dto</artifactId>
    
    223
    -              <version>${lib.version.toolkit}</version>
    
    224
    -            </dependency>
    
    225
    -            <dependency>
    
    226
    -              <groupId>fr.ird.observe</groupId>
    
    227
    -              <artifactId>toolkit-navigation</artifactId>
    
    228
    -              <version>${lib.version.toolkit}</version>
    
    229
    -            </dependency>
    
    230
    -            <dependency>
    
    231
    -              <groupId>fr.ird.observe</groupId>
    
    232
    -              <artifactId>toolkit-persistence</artifactId>
    
    233
    -              <version>${lib.version.toolkit}</version>
    
    234
    -            </dependency>
    
    235
    -            <dependency>
    
    236
    -              <groupId>io.ultreia.java4all</groupId>
    
    237
    -              <artifactId>java-util</artifactId>
    
    238
    -              <version>${lib.version.java4all.java-util}</version>
    
    239
    -            </dependency>
    
    240
    -            <dependency>
    
    241
    -              <groupId>io.ultreia.java4all.http</groupId>
    
    242
    -              <artifactId>http-api</artifactId>
    
    243
    -              <version>${lib.version.java4all.http}</version>
    
    244
    -            </dependency>
    
    245
    -            <dependency>
    
    246
    -              <groupId>io.ultreia.java4all.http</groupId>
    
    247
    -              <artifactId>http-maven-plugin</artifactId>
    
    248
    -              <version>${lib.version.java4all.http}</version>
    
    249
    -            </dependency>
    
    250
    -          </dependencies>
    
    251
    -        </plugin>
    
    252
    -      </plugins>
    
    253
    -    </pluginManagement>
    
    254 193
         <plugins>
    
    255 194
           <plugin>
    
    256 195
             <groupId>io.ultreia.java4all.http</groupId>
    
    ... ... @@ -301,6 +240,31 @@
    301 240
               </execution>
    
    302 241
             </executions>
    
    303 242
           </plugin>
    
    243
    +      <plugin>
    
    244
    +        <groupId>fr.ird.observe</groupId>
    
    245
    +        <artifactId>toolkit-maven-plugin</artifactId>
    
    246
    +        <version>${lib.version.toolkit}</version>
    
    247
    +        <dependencies>
    
    248
    +          <dependency>
    
    249
    +            <groupId>${project.groupId}</groupId>
    
    250
    +            <artifactId>core-dto</artifactId>
    
    251
    +            <version>${project.version}</version>
    
    252
    +          </dependency>
    
    253
    +          <dependency>
    
    254
    +            <groupId>${project.groupId}</groupId>
    
    255
    +            <artifactId>core-services-api</artifactId>
    
    256
    +            <version>${project.version}</version>
    
    257
    +          </dependency>
    
    258
    +        </dependencies>
    
    259
    +        <executions>
    
    260
    +          <execution>
    
    261
    +            <id>default-fixtures-generate</id>
    
    262
    +            <goals>
    
    263
    +              <goal>generate-service-local</goal>
    
    264
    +            </goals>
    
    265
    +          </execution>
    
    266
    +        </executions>
    
    267
    +      </plugin>
    
    304 268
         </plugins>
    
    305 269
       </build>
    
    306 270
       <profiles>