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

Commits:

8 changed files:

Changes:

  • application-swing-configuration/pom.xml
    ... ... @@ -48,13 +48,13 @@
    48 48 
         </dependency>
    49 49 
         <dependency>
    50 50 
           <groupId>${project.groupId}</groupId>
    51 
    -      <artifactId>services-validators</artifactId>
    51 
    +      <artifactId>services-validation</artifactId>
    52 52 
           <version>${project.version}</version>
    53 53 
           <scope>provided</scope>
    54 54 
         </dependency>
    55 55 
         <dependency>
    56 56 
           <groupId>${project.groupId}</groupId>
    57 
    -      <artifactId>application-swing-validators</artifactId>
    57 
    +      <artifactId>application-swing-validation</artifactId>
    58 58 
           <version>${project.version}</version>
    59 59 
           <scope>provided</scope>
    60 60 
         </dependency>

  • application-swing-validation/pom.xml
    ... ... @@ -126,6 +126,24 @@
    126 126 
         <plugins>
    127 127
    128 128 
           <plugin>
    129 
    +        <artifactId>maven-compiler-plugin</artifactId>
    130 
    +        <executions>
    131 
    +          <execution>
    132 
    +            <id>compile-generated-sources</id>
    133 
    +            <goals>
    134 
    +              <goal>compile</goal>
    135 
    +            </goals>
    136 
    +            <phase>process-classes</phase>
    137 
    +            <configuration>
    138 
    +              <includes>
    139 
    +                <include>**/I18nValidatorHelper.java</include>
    140 
    +              </includes>
    141 
    +            </configuration>
    142 
    +          </execution>
    143 
    +        </executions>
    144 
    +      </plugin>
    145 
    +
    146 
    +      <plugin>
    129 147 
             <groupId>${project.groupId}</groupId>
    130 148 
             <artifactId>toolbox-maven-plugin</artifactId>
    131 149 
             <version>${project.version}</version>
    ... ... @@ -144,7 +162,6 @@
    144 162 
               </execution>
    145 163 
               <execution>
    146 164 
                 <id>generate-validators-descriptor</id>
    147 
    -            <phase>generate-sources</phase>
    148 165 
                 <goals>
    149 166 
                   <goal>generate-validators-descriptor</goal>
    150 167 
                 </goals>
    ... ... @@ -156,11 +173,6 @@
    156 173 
                 <artifactId>services</artifactId>
    157 174 
                 <version>${project.version}</version>
    158 175 
               </dependency>
    159 
    -          <dependency>
    160 
    -            <groupId>${project.groupId}</groupId>
    161 
    -            <artifactId>application-swing-validators</artifactId>
    162 
    -            <version>${project.version}</version>
    163 
    -          </dependency>
    164 176 
             </dependencies>
    165 177 
           </plugin>
    166 178
    ... ... @@ -173,6 +185,7 @@
    173 185 
                 <goals>
    174 186 
                   <goal>parserJava</goal>
    175 187 
                 </goals>
    188 
    +            <phase>process-classes</phase>
    176 189 
                 <configuration>
    177 190 
                   <entries>
    178 191 
                     <entry>
    ... ... @@ -187,6 +200,7 @@
    187 200 
                 <goals>
    188 201 
                   <goal>parserValidation</goal>
    189 202 
                 </goals>
    203 
    +            <phase>process-classes</phase>
    190 204 
                 <configuration>
    191 205 
                   <entries>
    192 206 
                     <entry>
    ... ... @@ -203,6 +217,7 @@
    203 217 
                 <goals>
    204 218 
                   <goal>gen</goal>
    205 219 
                 </goals>
    220 
    +            <phase>process-classes</phase>
    206 221 
               </execution>
    207 222 
             </executions>
    208 223 
           </plugin>

  • application-web-configuration/pom.xml
    ... ... @@ -44,13 +44,13 @@
    44 44 
         </dependency>
    45 45 
         <dependency>
    46 46 
           <groupId>${project.groupId}</groupId>
    47 
    -      <artifactId>services-validators</artifactId>
    47 
    +      <artifactId>services-validation</artifactId>
    48 48 
           <version>${project.version}</version>
    49 49 
           <scope>provided</scope>
    50 50 
         </dependency>
    51 51 
         <dependency>
    52 52 
           <groupId>${project.groupId}</groupId>
    53 
    -      <artifactId>application-swing-validators</artifactId>
    53 
    +      <artifactId>application-swing-validation</artifactId>
    54 54 
           <version>${project.version}</version>
    55 55 
           <scope>provided</scope>
    56 56 
         </dependency>

  • services-runner/pom.xml
    ... ... @@ -78,22 +78,10 @@
    78 78 
         </dependency>
    79 79 
         <dependency>
    80 80 
           <groupId>${project.groupId}</groupId>
    81 
    -      <artifactId>services-validators</artifactId>
    82 
    -      <version>${project.version}</version>
    83 
    -      <scope>runtime</scope>
    84 
    -    </dependency>
    85 
    -    <dependency>
    86 
    -      <groupId>${project.groupId}</groupId>
    87 81 
           <artifactId>application-swing-validation</artifactId>
    88 82 
           <version>${project.version}</version>
    89 83 
           <scope>runtime</scope>
    90 84 
         </dependency>
    91 
    -    <dependency>
    92 
    -      <groupId>${project.groupId}</groupId>
    93 
    -      <artifactId>application-swing-validators</artifactId>
    94 
    -      <version>${project.version}</version>
    95 
    -      <scope>runtime</scope>
    96 
    -    </dependency>
    97 85
    98 86 
         <!-- Nuiton -->
    99 87

  • services-validation/pom.xml
    ... ... @@ -132,7 +132,6 @@
    132 132 
             <executions>
    133 133 
               <execution>
    134 134 
                 <id>generate-i18n-validator-fields</id>
    135 
    -            <phase>generate-sources</phase>
    136 135 
                 <goals>
    137 136 
                   <goal>generate-i18n-validator-fields</goal>
    138 137 
                 </goals>
    ... ... @@ -142,7 +141,6 @@
    142 141 
               </execution>
    143 142 
               <execution>
    144 143 
                 <id>generate-validators-descriptor</id>
    145 
    -            <phase>generate-sources</phase>
    146 144 
                 <goals>
    147 145 
                   <goal>generate-validators-descriptor</goal>
    148 146 
                 </goals>
    ... ... @@ -154,20 +152,33 @@
    154 152 
                 <artifactId>persistence</artifactId>
    155 153 
                 <version>${project.version}</version>
    156 154 
               </dependency>
    157 
    -          <dependency>
    158 
    -            <groupId>${project.groupId}</groupId>
    159 
    -            <artifactId>services-validators</artifactId>
    160 
    -            <version>${project.version}</version>
    161 
    -          </dependency>
    162 155 
             </dependencies>
    163 156 
           </plugin>
    164 157
    165 158 
           <plugin>
    159 
    +        <artifactId>maven-compiler-plugin</artifactId>
    160 
    +        <executions>
    161 
    +          <execution>
    162 
    +            <id>compile-generated-sources</id>
    163 
    +            <goals>
    164 
    +              <goal>compile</goal>
    165 
    +            </goals>
    166 
    +            <phase>process-classes</phase>
    167 
    +            <configuration>
    168 
    +              <includes>
    169 
    +                <include>**/I18nValidatorHelper.java</include>
    170 
    +              </includes>
    171 
    +            </configuration>
    172 
    +          </execution>
    173 
    +        </executions>
    174 
    +      </plugin>
    175 
    +      <plugin>
    166 176 
             <groupId>org.nuiton.i18n</groupId>
    167 177 
             <artifactId>i18n-maven-plugin</artifactId>
    168 178 
             <executions>
    169 179 
               <execution>
    170 180 
                 <id>parse-java</id>
    181 
    +            <phase>process-classes</phase>
    171 182 
                 <goals>
    172 183 
                   <goal>parserJava</goal>
    173 184 
                 </goals>
    ... ... @@ -182,6 +193,7 @@
    182 193 
               </execution>
    183 194 
               <execution>
    184 195 
                 <id>parse-validation</id>
    196 
    +            <phase>process-classes</phase>
    185 197 
                 <goals>
    186 198 
                   <goal>parserValidation</goal>
    187 199 
                 </goals>
    ... ... @@ -198,6 +210,7 @@
    198 210 
               </execution>
    199 211 
               <execution>
    200 212 
                 <id>gen</id>
    213 
    +            <phase>process-classes</phase>
    201 214 
                 <goals>
    202 215 
                   <goal>gen</goal>
    203 216 
                 </goals>

  • toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java
    ... ... @@ -44,7 +44,7 @@ import java.util.TreeSet;
    44 44 
      * @author Tony Chemit - dev@tchemit.fr
    45 45 
      * @since 5.0
    46 46 
      */
    47 
    -@Mojo(name = "generate-i18n-validator-fields", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE)
    47 
    +@Mojo(name = "generate-i18n-validator-fields", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE)
    48 48 
     class GenerateI18nValidatorFieldsMojo extends GenerateValidatorMojoSupport {
    49 49
    50 50 
         /**

  • toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java
    ... ... @@ -84,7 +84,7 @@ public abstract class GenerateValidatorMojoSupport extends ToolboxMojoSupport im
    84 84
    85 85 
         @Override
    86 86 
         public URLClassLoader getUrlClassLoader() throws MalformedURLException {
    87 
    -        return initClassLoader(getProject(), validatorsFile.getParentFile(), true, false, true, true, false);
    87 
    +        return initClassLoader(getProject(), validatorsFile.getParentFile(), false, true, true, true, true);
    88 88 
         }
    89 89
    90 90 
     }

  • toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java
    ... ... @@ -48,7 +48,7 @@ import java.util.TreeSet;
    48 48 
      * @author Tony Chemit - dev@tchemit.fr
    49 49 
      * @since 5.0
    50 50 
      */
    51 
    -@Mojo(name = "generate-validators-descriptor", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE)
    51 
    +@Mojo(name = "generate-validators-descriptor", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE)
    52 52 
     class GenerateValidatorsDescriptorMojo extends GenerateValidatorMojoSupport {
    53 53
    54 54 
         /**

    • —
    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.