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

Commits:

26 changed files:

Changes:

  • client-configuration/pom.xml
    ... ... @@ -97,8 +97,7 @@
    97 97 
         </dependency>
    98 98 
         <dependency>
    99 99 
           <groupId>com.google.auto.service</groupId>
    100 
    -      <artifactId>auto-service</artifactId>
    101 
    -      <scope>provided</scope>
    100 
    +      <artifactId>auto-service-annotations</artifactId>
    102 101 
         </dependency>
    103 102
    104 103 
         <dependency>

  • client-core/pom.xml
    ... ... @@ -207,6 +207,11 @@
    207 207 
           <groupId>com.google.code.gson</groupId>
    208 208 
           <artifactId>gson</artifactId>
    209 209 
         </dependency>
    210 
    +    <dependency>
    211 
    +      <groupId>com.google.auto.service</groupId>
    212 
    +      <artifactId>auto-service-annotations</artifactId>
    213 
    +    </dependency>
    214 
    +
    210 215 
         <dependency>
    211 216 
           <groupId>io.ultreia.java4all.config</groupId>
    212 217 
           <artifactId>config-api</artifactId>

  • client-datasource-actions/pom.xml
    ... ... @@ -29,8 +29,8 @@
    29 29
    30 30 
       <artifactId>client-datasource-actions</artifactId>
    31 31
    32 
    -  <name>ObServe :: Client DataSource actions</name>
    33 
    -  <description>ObServe Client DataSource actions module</description>
    32 
    +  <name>ObServe :: Client DataSource Actions</name>
    33 
    +  <description>ObServe Client DataSource Actions module</description>
    34 34
    35 35 
       <dependencies>
    36 36
    ... ... @@ -162,6 +162,10 @@
    162 162 
           <groupId>com.google.guava</groupId>
    163 163 
           <artifactId>guava</artifactId>
    164 164 
         </dependency>
    165 
    +    <dependency>
    166 
    +      <groupId>com.google.auto.service</groupId>
    167 
    +      <artifactId>auto-service-annotations</artifactId>
    168 
    +    </dependency>
    165 169
    166 170 
         <dependency>
    167 171 
           <groupId>org.nuiton</groupId>
    ... ... @@ -200,11 +204,6 @@
    200 204 
           <groupId>junit</groupId>
    201 205 
           <artifactId>junit</artifactId>
    202 206 
         </dependency>
    203 
    -    <dependency>
    204 
    -      <groupId>com.google.auto.service</groupId>
    205 
    -      <artifactId>auto-service</artifactId>
    206 
    -      <scope>provided</scope>
    207 
    -    </dependency>
    208 207
    209 208 
       </dependencies>
    210 209

  • client-datasource-editor-api/pom.xml
    ... ... @@ -185,6 +185,10 @@
    185 185 
           <groupId>com.google.guava</groupId>
    186 186 
           <artifactId>guava</artifactId>
    187 187 
         </dependency>
    188 
    +    <dependency>
    189 
    +      <groupId>com.google.auto.service</groupId>
    190 
    +      <artifactId>auto-service-annotations</artifactId>
    191 
    +    </dependency>
    188 192
    189 193 
         <dependency>
    190 194 
           <groupId>org.nuiton</groupId>
    ... ... @@ -235,11 +239,6 @@
    235 239 
           <groupId>junit</groupId>
    236 240 
           <artifactId>junit</artifactId>
    237 241 
         </dependency>
    238 
    -    <dependency>
    239 
    -      <groupId>com.google.auto.service</groupId>
    240 
    -      <artifactId>auto-service</artifactId>
    241 
    -      <scope>provided</scope>
    242 
    -    </dependency>
    243 242
    244 243 
       </dependencies>
    245 244

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/Save.java
    ... ... @@ -75,7 +75,14 @@ public class Save<D extends ReferentialDto, R extends ReferentialDtoReference<D,
    75 75 
             try {
    76 76 
                 boolean ok = doSave(ui, model.getBean(), notPersisted);
    77 77 
                 if (ok) {
    78 
    -                afterSave(ui, model.getBean(), notPersisted);
    78 
    +                try {
    79 
    +                    model.setResetEdit(true);
    80 
    +                    afterSave(ui, model.getBean(), notPersisted);
    81 
    +                } finally {
    82 
    +                    SwingValidatorUtil.setValidatorChanged(ui, false);
    83 
    +                    model.setResetEdit(false);
    84 
    +                    model.setModified(false);
    85 
    +                }
    79 86 
                 }
    80 87 
             } catch (Exception e) {
    81 88 
                 UIHelper.handlingError(e);
    ... ... @@ -153,7 +160,6 @@ public class Save<D extends ReferentialDto, R extends ReferentialDtoReference<D,
    153 160 
         }
    154 161
    155 162 
         private void afterSave(U ui, D bean, boolean notPersisted) {
    156 
    -        SwingValidatorUtil.setValidatorChanged(ui, false);
    157 163 
             getDataSource().setModified(true);
    158 164
    159 165 
             NavigationTree tree = getDataSourceEditor().getNavigationUI().getTree();

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/spi/ContentUIReferenceCache.java
    ... ... @@ -226,7 +226,7 @@ public class ContentUIReferenceCache {
    226 226
    227 227 
             log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size()));
    228 228
    229 
    -        if (hideDisabledReferential && !propertyName.equals("referentialListHeader")) {
    229 
    +        if (hideDisabledReferential && !propertyName.equals(FormDefinition.REFERENTIAL_LIST_HEADER)) {
    230 230 
                 incomingReferences = DtoReferenceCollection.filterEnabled(incomingReferences);
    231 231 
                 log.debug(String.format("Filter referential references (type %s - property %s), without disabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size()));
    232 232 
             }
    ... ... @@ -300,7 +300,7 @@ public class ContentUIReferenceCache {
    300 300 
             Boolean noLoad = (Boolean) list.getClientProperty(JaxxObjectInitializer.CLIENT_PROPERTY_LIST_NO_LOAD);
    301 301 
             List<R> data;
    302 302 
             String propertyName = list.getName();
    303 
    -        if (!"referentialListHeader".equals(propertyName) && (Objects.equals(true, noLoad) || form == null)) {
    303 
    +        if (!FormDefinition.REFERENTIAL_LIST_HEADER.equals(propertyName) && (Objects.equals(true, noLoad) || form == null)) {
    304 304 
                 log.debug(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName));
    305 305 
                 data = Collections.emptyList();
    306 306 
             } else {

  • client-datasource-editor-common/pom.xml
    ... ... @@ -134,6 +134,10 @@
    134 134 
           <groupId>com.google.guava</groupId>
    135 135 
           <artifactId>guava</artifactId>
    136 136 
         </dependency>
    137 
    +    <dependency>
    138 
    +      <groupId>com.google.auto.service</groupId>
    139 
    +      <artifactId>auto-service-annotations</artifactId>
    140 
    +    </dependency>
    137 141
    138 142
    139 143 
         <dependency>
    ... ... @@ -189,11 +193,6 @@
    189 193 
           <groupId>junit</groupId>
    190 194 
           <artifactId>junit</artifactId>
    191 195 
         </dependency>
    192 
    -    <dependency>
    193 
    -      <groupId>com.google.auto.service</groupId>
    194 
    -      <artifactId>auto-service</artifactId>
    195 
    -      <scope>provided</scope>
    196 
    -    </dependency>
    197 196
    198 197 
       </dependencies>
    199 198

  • client-datasource-editor-ll/pom.xml
    ... ... @@ -170,6 +170,10 @@
    170 170 
           <groupId>com.google.guava</groupId>
    171 171 
           <artifactId>guava</artifactId>
    172 172 
         </dependency>
    173 
    +    <dependency>
    174 
    +      <groupId>com.google.auto.service</groupId>
    175 
    +      <artifactId>auto-service-annotations</artifactId>
    176 
    +    </dependency>
    173 177
    174 178 
         <dependency>
    175 179 
           <groupId>org.nuiton</groupId>
    ... ... @@ -241,11 +245,6 @@
    241 245 
           <groupId>org.jetbrains</groupId>
    242 246 
           <artifactId>annotations</artifactId>
    243 247 
         </dependency>
    244 
    -    <dependency>
    245 
    -      <groupId>com.google.auto.service</groupId>
    246 
    -      <artifactId>auto-service</artifactId>
    247 
    -      <scope>provided</scope>
    248 
    -    </dependency>
    249 248
    250 249 
       </dependencies>
    251 250

  • client-datasource-editor-ps/pom.xml
    ... ... @@ -163,6 +163,10 @@
    163 163 
           <groupId>com.google.guava</groupId>
    164 164 
           <artifactId>guava</artifactId>
    165 165 
         </dependency>
    166 
    +    <dependency>
    167 
    +      <groupId>com.google.auto.service</groupId>
    168 
    +      <artifactId>auto-service-annotations</artifactId>
    169 
    +    </dependency>
    166 170
    167 171 
         <dependency>
    168 172 
           <groupId>org.nuiton</groupId>
    ... ... @@ -244,11 +248,6 @@
    244 248 
           <groupId>org.jetbrains</groupId>
    245 249 
           <artifactId>annotations</artifactId>
    246 250 
         </dependency>
    247 
    -    <dependency>
    248 
    -      <groupId>com.google.auto.service</groupId>
    249 
    -      <artifactId>auto-service</artifactId>
    250 
    -      <scope>provided</scope>
    251 
    -    </dependency>
    252 251
    253 252 
       </dependencies>
    254 253

  • client-runner/pom.xml
    ... ... @@ -198,6 +198,16 @@
    198 198 
           <groupId>com.google.guava</groupId>
    199 199 
           <artifactId>guava</artifactId>
    200 200 
         </dependency>
    201 
    +    <dependency>
    202 
    +      <groupId>com.google.auto.service</groupId>
    203 
    +      <artifactId>auto-service-annotations</artifactId>
    204 
    +    </dependency>
    205 
    +
    206 
    +    <dependency>
    207 
    +      <groupId>com.google.auto.service</groupId>
    208 
    +      <artifactId>auto-service</artifactId>
    209 
    +      <scope>provided</scope>
    210 
    +    </dependency>
    201 211 
         <dependency>
    202 212 
           <groupId>commons-beanutils</groupId>
    203 213 
           <artifactId>commons-beanutils</artifactId>
    ... ... @@ -217,11 +227,6 @@
    217 227 
           <groupId>junit</groupId>
    218 228 
           <artifactId>junit</artifactId>
    219 229 
         </dependency>
    220 
    -    <dependency>
    221 
    -      <groupId>com.google.auto.service</groupId>
    222 
    -      <artifactId>auto-service</artifactId>
    223 
    -      <scope>provided</scope>
    224 
    -    </dependency>
    225 230
    226 231 
       </dependencies>
    227 232

  • dto-spi/pom.xml
    ... ... @@ -39,6 +39,10 @@
    39 39 
           <groupId>fr.ird.observe.toolkit</groupId>
    40 40 
           <artifactId>common-dto</artifactId>
    41 41 
         </dependency>
    42 
    +    <dependency>
    43 
    +      <groupId>com.google.auto.service</groupId>
    44 
    +      <artifactId>auto-service-annotations</artifactId>
    45 
    +    </dependency>
    42 46
    43 47 
         <dependency>
    44 48 
           <groupId>com.google.auto.service</groupId>

  • dto/pom.xml
    ... ... @@ -115,6 +115,10 @@
    115 115 
           <groupId>com.google.guava</groupId>
    116 116 
           <artifactId>guava</artifactId>
    117 117 
         </dependency>
    118 
    +    <dependency>
    119 
    +      <groupId>com.google.auto.service</groupId>
    120 
    +      <artifactId>auto-service-annotations</artifactId>
    121 
    +    </dependency>
    118 122 
         <dependency>
    119 123 
           <groupId>com.google.code.gson</groupId>
    120 124 
           <artifactId>gson</artifactId>

  • observe-i18n/pom.xml
    ... ... @@ -35,11 +35,9 @@
    35 35 
         <i18n.artifactId>observe</i18n.artifactId>
    36 36 
       </properties>
    37 37 
       <dependencies>
    38 
    -
    39 38 
         <dependency>
    40 39 
           <groupId>com.google.auto.service</groupId>
    41 
    -      <artifactId>auto-service</artifactId>
    42 
    -      <scope>provided</scope>
    40 
    +      <artifactId>auto-service-annotations</artifactId>
    43 41 
         </dependency>
    44 42 
         <dependency>
    45 43 
           <groupId>com.google.guava</groupId>

  • persistence-spi/pom.xml
    ... ... @@ -50,12 +50,15 @@
    50 50 
           <artifactId>common-persistence</artifactId>
    51 51 
         </dependency>
    52 52
    53 
    +    <dependency>
    54 
    +      <groupId>com.google.auto.service</groupId>
    55 
    +      <artifactId>auto-service-annotations</artifactId>
    56 
    +    </dependency>
    53 57 
         <dependency>
    54 58 
           <groupId>com.google.auto.service</groupId>
    55 59 
           <artifactId>auto-service</artifactId>
    56 60 
           <scope>provided</scope>
    57 61 
         </dependency>
    58 
    -
    59 62 
         <dependency>
    60 63 
           <groupId>junit</groupId>
    61 64 
           <artifactId>junit</artifactId>

  • persistence/pom.xml
    ... ... @@ -133,11 +133,16 @@
    133 133 
           <groupId>com.google.guava</groupId>
    134 134 
           <artifactId>guava</artifactId>
    135 135 
         </dependency>
    136 
    +    <dependency>
    137 
    +      <groupId>com.google.auto.service</groupId>
    138 
    +      <artifactId>auto-service-annotations</artifactId>
    139 
    +    </dependency>
    136 140 
         <dependency>
    137 141 
           <groupId>com.google.auto.service</groupId>
    138 142 
           <artifactId>auto-service</artifactId>
    139 143 
           <scope>provided</scope>
    140 144 
         </dependency>
    145 
    +
    141 146 
         <dependency>
    142 147 
           <groupId>javax.persistence</groupId>
    143 148 
           <artifactId>javax.persistence-api</artifactId>

  • pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24 
       <parent>
    25 25 
         <groupId>io.ultreia.maven</groupId>
    26 26 
         <artifactId>pom</artifactId>
    27 
    -    <version>2020.25</version>
    27 
    +    <version>2020.26</version>
    28 28 
       </parent>
    29 29
    30 30 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -162,7 +162,7 @@
    162 162 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    163 163 
         <buildDate>${maven.build.timestamp}</buildDate>
    164 164
    165 
    -    <lib.version.toolkit>4.30</lib.version.toolkit>
    165 
    +    <lib.version.toolkit>4.31</lib.version.toolkit>
    166 166 
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    167 167 
         <!--can't use 1.4.197 (date has changed + blob also)-->
    168 168 
         <lib.version.h2>1.4.196</lib.version.h2>

  • server-configuration/pom.xml
    ... ... @@ -78,14 +78,9 @@
    78 78 
           <groupId>org.apache.commons</groupId>
    79 79 
           <artifactId>commons-collections4</artifactId>
    80 80 
         </dependency>
    81 
    -    <!--    <dependency>-->
    82 
    -    <!--      <groupId>com.google.guava</groupId>-->
    83 
    -    <!--      <artifactId>guava</artifactId>-->
    84 
    -    <!--    </dependency>-->
    85 81 
         <dependency>
    86 82 
           <groupId>com.google.auto.service</groupId>
    87 83 
           <artifactId>auto-service-annotations</artifactId>
    88 
    -      <scope>provided</scope>
    89 84 
         </dependency>
    90 85
    91 86 
         <dependency>

  • server-core/pom.xml
    ... ... @@ -113,7 +113,6 @@
    113 113 
         <dependency>
    114 114 
           <groupId>com.google.auto.service</groupId>
    115 115 
           <artifactId>auto-service-annotations</artifactId>
    116 
    -      <scope>provided</scope>
    117 116 
         </dependency>
    118 117
    119 118 
         <dependency>
    ... ... @@ -193,12 +192,12 @@
    193 192 
           <groupId>junit</groupId>
    194 193 
           <artifactId>junit</artifactId>
    195 194 
         </dependency>
    196 
    -
    197 195 
         <dependency>
    198 196 
           <groupId>com.google.auto.service</groupId>
    199 197 
           <artifactId>auto-service</artifactId>
    200 198 
           <scope>provided</scope>
    201 199 
         </dependency>
    200 
    +
    202 201 
         <dependency>
    203 202 
           <groupId>javax.annotation</groupId>
    204 203 
           <artifactId>jsr250-api</artifactId>

  • services-client/pom.xml
    ... ... @@ -133,12 +133,6 @@
    133 133 
           <groupId>junit</groupId>
    134 134 
           <artifactId>junit</artifactId>
    135 135 
         </dependency>
    136 
    -
    137 
    -    <dependency>
    138 
    -      <groupId>com.google.auto.service</groupId>
    139 
    -      <artifactId>auto-service</artifactId>
    140 
    -      <scope>provided</scope>
    141 
    -    </dependency>
    142 136 
         <dependency>
    143 137 
           <groupId>javax.annotation</groupId>
    144 138 
           <artifactId>jsr250-api</artifactId>

  • services-local/pom.xml
    ... ... @@ -19,7 +19,8 @@
    19 19 
       #L%
    20 20 
       -->
    21 21
    22 
    -<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">
    22 
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    23 
    +         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    23 24 
       <modelVersion>4.0.0</modelVersion>
    24 25
    25 26 
       <parent>
    ... ... @@ -119,6 +120,10 @@
    119 120 
           <groupId>com.google.guava</groupId>
    120 121 
           <artifactId>guava</artifactId>
    121 122 
         </dependency>
    123 
    +    <dependency>
    124 
    +      <groupId>com.google.auto.service</groupId>
    125 
    +      <artifactId>auto-service-annotations</artifactId>
    126 
    +    </dependency>
    122 127
    123 128 
         <dependency>
    124 129 
           <groupId>javax.persistence</groupId>
    ... ... @@ -258,14 +263,18 @@
    258 263 
                 <executions>
    259 264 
                   <execution>
    260 265 
                     <id>update-test-dbs</id>
    261 
    -                <goals><goal>test</goal></goals>
    266 
    +                <goals>
    267 
    +                  <goal>test</goal>
    268 
    +                </goals>
    262 269 
                     <configuration>
    263 270 
                       <test>fr.ird.observe.services.local.service.sql.MigrateTestsDatabases</test>
    264 271 
                     </configuration>
    265 272 
                   </execution>
    266 273 
                   <execution>
    267 274 
                     <id>default-test</id>
    268 
    -                <goals><goal>test</goal></goals>
    275 
    +                <goals>
    276 
    +                  <goal>test</goal>
    277 
    +                </goals>
    269 278 
                     <configuration>
    270 279 
                       <skip>true</skip>
    271 280 
                     </configuration>

  • services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java
    ... ... @@ -187,7 +187,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe
    187 187 
         public <D extends ReferentialDto> SaveResultDto save(D bean) {
    188 188 
             ReferentialDtoEntityContext<D, ?, ?, ?> spi = DbModelHelper.fromReferentialDtoWeak(bean);
    189 189 
             ReferentialEntity<D, ?> entity = loadOrCreateEntityFromReferentialDto(spi, bean);
    190 
    -        entity.toDto(getReferentialLocale(), bean);
    190 
    +        entity.fromDto(getReferentialLocale(), bean);
    191 191 
             return saveEntity(entity);
    192 192
    193 193 
         }

  • services-validation/pom.xml
    ... ... @@ -19,7 +19,8 @@
    19 19 
       #L%
    20 20 
       -->
    21 21
    22 
    -<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">
    22 
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    23 
    +         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    23 24 
       <modelVersion>4.0.0</modelVersion>
    24 25
    25 26 
       <parent>
    ... ... @@ -68,10 +69,10 @@
    68 69 
           <artifactId>common-validation</artifactId>
    69 70 
         </dependency>
    70 71
    71 
    - <dependency>
    72 
    -   <groupId>org.nuiton</groupId>
    73 
    -   <artifactId>nuiton-decorator</artifactId>
    74 
    - </dependency>
    72 
    +    <dependency>
    73 
    +      <groupId>org.nuiton</groupId>
    74 
    +      <artifactId>nuiton-decorator</artifactId>
    75 
    +    </dependency>
    75 76 
         <dependency>
    76 77 
           <groupId>org.nuiton</groupId>
    77 78 
           <artifactId>nuiton-validator</artifactId>
    ... ... @@ -88,6 +89,10 @@
    88 89 
           <groupId>io.ultreia.java4all</groupId>
    89 90 
           <artifactId>java-util</artifactId>
    90 91 
         </dependency>
    92 
    +    <dependency>
    93 
    +      <groupId>com.google.auto.service</groupId>
    94 
    +      <artifactId>auto-service-annotations</artifactId>
    95 
    +    </dependency>
    91 96
    92 97 
         <dependency>
    93 98 
           <groupId>org.apache.logging.log4j</groupId>
    ... ... @@ -131,37 +136,37 @@
    131 136 
       </dependencies>
    132 137
    133 138 
       <build>
    134 
    -      <plugins>
    135 
    -        <plugin>
    136 
    -          <groupId>io.ultreia.java4all.http</groupId>
    137 
    -          <artifactId>http-maven-plugin</artifactId>
    138 
    -          <executions>
    139 
    -            <execution>
    140 
    -              <id>default-generate-services-provider</id>
    141 
    -              <goals>
    142 
    -                <goal>generate-services-provider</goal>
    143 
    -              </goals>
    144 
    -              <configuration>
    145 
    -                <packageName>fr.ird.observe.services</packageName>
    146 
    -                <serviceType>fr.ird.observe.services.service.ObserveService</serviceType>
    147 
    -                <classPrefix>Observe</classPrefix>
    148 
    -                <methodNameTranslatorName>package</methodNameTranslatorName>
    149 
    -              </configuration>
    150 
    -            </execution>
    151 
    -          </executions>
    152 
    -          <dependencies>
    153 
    -            <dependency>
    154 
    -              <groupId>fr.ird.observe.toolkit</groupId>
    155 
    -              <artifactId>common-service</artifactId>
    156 
    -              <version>${lib.version.toolkit}</version>
    157 
    -            </dependency>
    158 
    -            <dependency>
    159 
    -              <groupId>${project.groupId}</groupId>
    160 
    -              <artifactId>services</artifactId>
    161 
    -              <version>${project.version}</version>
    162 
    -            </dependency>
    163 
    -          </dependencies>
    164 
    -        </plugin>
    165 
    -      </plugins>
    139 
    +    <plugins>
    140 
    +      <plugin>
    141 
    +        <groupId>io.ultreia.java4all.http</groupId>
    142 
    +        <artifactId>http-maven-plugin</artifactId>
    143 
    +        <executions>
    144 
    +          <execution>
    145 
    +            <id>default-generate-services-provider</id>
    146 
    +            <goals>
    147 
    +              <goal>generate-services-provider</goal>
    148 
    +            </goals>
    149 
    +            <configuration>
    150 
    +              <packageName>fr.ird.observe.services</packageName>
    151 
    +              <serviceType>fr.ird.observe.services.service.ObserveService</serviceType>
    152 
    +              <classPrefix>Observe</classPrefix>
    153 
    +              <methodNameTranslatorName>package</methodNameTranslatorName>
    154 
    +            </configuration>
    155 
    +          </execution>
    156 
    +        </executions>
    157 
    +        <dependencies>
    158 
    +          <dependency>
    159 
    +            <groupId>fr.ird.observe.toolkit</groupId>
    160 
    +            <artifactId>common-service</artifactId>
    161 
    +            <version>${lib.version.toolkit}</version>
    162 
    +          </dependency>
    163 
    +          <dependency>
    164 
    +            <groupId>${project.groupId}</groupId>
    165 
    +            <artifactId>services</artifactId>
    166 
    +            <version>${project.version}</version>
    167 
    +          </dependency>
    168 
    +        </dependencies>
    169 
    +      </plugin>
    170 
    +    </plugins>
    166 171 
       </build>
    167 172 
     </project>

  • services/pom.xml
    ... ... @@ -122,6 +122,10 @@
    122 122 
           <groupId>com.google.code.gson</groupId>
    123 123 
           <artifactId>gson</artifactId>
    124 124 
         </dependency>
    125 
    +    <dependency>
    126 
    +      <groupId>com.google.auto.service</groupId>
    127 
    +      <artifactId>auto-service-annotations</artifactId>
    128 
    +    </dependency>
    125 129
    126 130 
         <dependency>
    127 131 
           <groupId>org.apache.logging.log4j</groupId>

  • test-config/pom.xml
    ... ... @@ -48,12 +48,15 @@
    48 48 
           <artifactId>common-dto</artifactId>
    49 49 
         </dependency>
    50 50
    51 
    +    <dependency>
    52 
    +      <groupId>com.google.auto.service</groupId>
    53 
    +      <artifactId>auto-service-annotations</artifactId>
    54 
    +    </dependency>
    51 55 
         <dependency>
    52 56 
           <groupId>com.google.auto.service</groupId>
    53 57 
           <artifactId>auto-service</artifactId>
    54 58 
           <scope>provided</scope>
    55 59 
         </dependency>
    56 
    -
    57 60 
         <dependency>
    58 61 
           <groupId>junit</groupId>
    59 62 
           <artifactId>junit</artifactId>

  • test/pom.xml
    ... ... @@ -38,12 +38,6 @@
    38 38 
           <groupId>com.google.guava</groupId>
    39 39 
           <artifactId>guava</artifactId>
    40 40 
         </dependency>
    41 
    -    <dependency>
    42 
    -      <groupId>com.google.auto.service</groupId>
    43 
    -      <artifactId>auto-service</artifactId>
    44 
    -      <scope>provided</scope>
    45 
    -    </dependency>
    46 
    -
    47 41 
         <dependency>
    48 42 
           <groupId>org.apache.logging.log4j</groupId>
    49 43 
           <artifactId>log4j-api</artifactId>

  • validation/pom.xml
    ... ... @@ -18,7 +18,8 @@
    18 18 
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    19 19 
       #L%
    20 20 
       -->
    21 
    -<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">
    21 
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    22 
    +         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    22 23 
       <modelVersion>4.0.0</modelVersion>
    23 24
    24 25 
       <parent>
    ... ... @@ -62,10 +63,10 @@
    62 63 
           <scope>test</scope>
    63 64 
         </dependency>
    64 65
    65 
    -<dependency>
    66 
    -  <groupId>org.nuiton</groupId>
    67 
    -  <artifactId>nuiton-validator</artifactId>
    68 
    -</dependency>
    66 
    +    <dependency>
    67 
    +      <groupId>org.nuiton</groupId>
    68 
    +      <artifactId>nuiton-validator</artifactId>
    69 
    +    </dependency>
    69 70
    70 71 
         <dependency>
    71 72 
           <groupId>org.apache.logging.log4j</groupId>
    ... ... @@ -81,6 +82,10 @@
    81 82 
           <groupId>com.google.guava</groupId>
    82 83 
           <artifactId>guava</artifactId>
    83 84 
         </dependency>
    85 
    +    <dependency>
    86 
    +      <groupId>com.google.auto.service</groupId>
    87 
    +      <artifactId>auto-service-annotations</artifactId>
    88 
    +    </dependency>
    84 89
    85 90 
         <dependency>
    86 91 
           <groupId>fr.ird.observe.toolkit</groupId>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.