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

Commits:

12 changed files:

Changes:

  • application-swing-configuration/pom.xml
    ... ... @@ -99,22 +99,6 @@
    99 99
    100 100 
       <build>
    101 101
    102 
    -    <resources>
    103 
    -      <resource>
    104 
    -        <directory>src/main/filtered-resources</directory>
    105 
    -        <includes>
    106 
    -          <include>**/*</include>
    107 
    -        </includes>
    108 
    -        <filtering>true</filtering>
    109 
    -      </resource>
    110 
    -      <resource>
    111 
    -        <directory>src/main/resources</directory>
    112 
    -        <includes>
    113 
    -          <include>**/*</include>
    114 
    -        </includes>
    115 
    -      </resource>
    116 
    -    </resources>
    117 
    -
    118 102 
         <plugins>
    119 103
    120 104 
           <plugin>

  • application-swing-validation/pom.xml
    ... ... @@ -34,10 +34,6 @@
    34 34 
       <name>ObServe :: Application Swing Validation</name>
    35 35 
       <description>ObServe Application Swing Validation</description>
    36 36
    37 
    -  <properties>
    38 
    -
    39 
    -  </properties>
    40 
    -
    41 37 
       <dependencies>
    42 38
    43 39 
         <!-- sibling dependencies -->

  • application-swing/pom.xml
    ... ... @@ -598,21 +598,6 @@
    598 598
    599 599 
         <finalName>${applicationName}-${project.version}</finalName>
    600 600
    601 
    -    <resources>
    602 
    -      <resource>
    603 
    -        <directory>src/main/filtered-resources</directory>
    604 
    -        <filtering>true</filtering>
    605 
    -        <includes>
    606 
    -          <include>**/*</include>
    607 
    -        </includes>
    608 
    -      </resource>
    609 
    -      <resource>
    610 
    -        <directory>src/main/resources</directory>
    611 
    -        <includes>
    612 
    -          <include>**/*</include>
    613 
    -        </includes>
    614 
    -      </resource>
    615 
    -    </resources>
    616 601 
         <pluginManagement>
    617 602
    618 603 
           <plugins>

  • application-web-configuration/pom.xml
    ... ... @@ -102,21 +102,6 @@
    102 102 
       </dependencies>
    103 103
    104 104 
       <build>
    105 
    -    <resources>
    106 
    -      <resource>
    107 
    -        <directory>src/main/filtered-resources</directory>
    108 
    -        <includes>
    109 
    -          <include>**/*</include>
    110 
    -        </includes>
    111 
    -        <filtering>true</filtering>
    112 
    -      </resource>
    113 
    -      <resource>
    114 
    -        <directory>src/main/resources</directory>
    115 
    -        <includes>
    116 
    -          <include>**/*</include>
    117 
    -        </includes>
    118 
    -      </resource>
    119 
    -    </resources>
    120 105
    121 106 
         <plugins>
    122 107

  • application-web/pom.xml
    ... ... @@ -164,16 +164,6 @@
    164 164
    165 165 
         <finalName>${applicationName}-${project.version}</finalName>
    166 166
    167 
    -    <resources>
    168 
    -      <resource>
    169 
    -        <directory>${project.basedir}/src/main/filtered-resources</directory>
    170 
    -        <filtering>true</filtering>
    171 
    -        <includes>
    172 
    -          <include>**/*</include>
    173 
    -        </includes>
    174 
    -      </resource>
    175 
    -
    176 
    -    </resources>
    177 167 
         <plugins>
    178 168
    179 169 
           <plugin>

  • persistence/pom.xml
    ... ... @@ -144,20 +144,6 @@
    144 144 
       </dependencies>
    145 145
    146 146 
       <build>
    147 
    -    <resources>
    148 
    -      <resource>
    149 
    -        <directory>${project.build.directory}/xmi</directory>
    150 
    -        <includes>
    151 
    -          <include>*.objectmodel-ext</include>
    152 
    -        </includes>
    153 
    -      </resource>
    154 
    -      <resource>
    155 
    -        <directory>${project.basedir}/src/main/resources</directory>
    156 
    -        <includes>
    157 
    -          <include>**/*</include>
    158 
    -        </includes>
    159 
    -      </resource>
    160 
    -    </resources>
    161 147
    162 148 
         <pluginManagement>
    163 149
    ... ... @@ -239,7 +225,6 @@
    239 225 
                 <configuration>
    240 226 
                   <defaultPackage>fr.ird.observe.persistence</defaultPackage>
    241 227 
                   <fullPackagePath>fr.ird.observe</fullPackagePath>
    242 
    -              <!--<modelExtensionFile>${project.build.directory}/xmi/observe.ini</modelExtensionFile>-->
    243 228 
                   <inputs>
    244 229 
                     <input>friend</input>
    245 230 
                   </inputs>

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>10</version>
    29 
    +    <version>13</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>

  • services-rest/pom.xml
    ... ... @@ -124,41 +124,4 @@
    124 124
    125 125 
       </dependencies>
    126 126
    127 
    -
    128 
    -  <build>
    129 
    -
    130 
    -    <plugins>
    131 
    -
    132 
    -      <plugin>
    133 
    -        <groupId>org.codehaus.gmavenplus</groupId>
    134 
    -        <artifactId>gmavenplus-plugin</artifactId>
    135 
    -        <executions>
    136 
    -          <execution>
    137 
    -            <phase>process-classes</phase>
    138 
    -            <goals>
    139 
    -              <goal>execute</goal>
    140 
    -            </goals>
    141 
    -            <configuration>
    142 
    -              <scripts>
    143 
    -                <script><![CDATA[
    144 
    -                        new org.reflections.Reflections("fr.ird.observe.services.rest")
    145 
    -                            .save("${project.build.outputDirectory}/META-INF/reflections/${project.artifactId}-reflections.xml")
    146 
    -                    ]]></script>
    147 
    -              </scripts>
    148 
    -            </configuration>
    149 
    -          </execution>
    150 
    -        </executions>
    151 
    -        <dependencies>
    152 
    -          <dependency>
    153 
    -            <groupId>dom4j</groupId>
    154 
    -            <artifactId>dom4j</artifactId>
    155 
    -            <version>1.6.1</version>
    156 
    -          </dependency>
    157 
    -        </dependencies>
    158 
    -      </plugin>
    159 
    -
    160 
    -    </plugins>
    161 
    -
    162 
    -  </build>
    163 
    -
    164 127 
     </project>

  • services-topia/pom.xml
    ... ... @@ -172,28 +172,6 @@
    172 172 
         <plugins>
    173 173
    174 174 
           <plugin>
    175 
    -        <groupId>org.codehaus.gmavenplus</groupId>
    176 
    -        <artifactId>gmavenplus-plugin</artifactId>
    177 
    -        <executions>
    178 
    -          <execution>
    179 
    -            <id>generate-reflections.xml</id>
    180 
    -            <phase>process-classes</phase>
    181 
    -            <goals>
    182 
    -              <goal>execute</goal>
    183 
    -            </goals>
    184 
    -            <configuration>
    185 
    -              <scripts>
    186 
    -                <script><![CDATA[
    187 
    -                        new org.reflections.Reflections("fr.ird.observe.services.topia")
    188 
    -                            .save("${project.build.outputDirectory}/META-INF/reflections/${project.artifactId}-reflections.xml")
    189 
    -                    ]]></script>
    190 
    -              </scripts>
    191 
    -            </configuration>
    192 
    -          </execution>
    193 
    -        </executions>
    194 
    -      </plugin>
    195 
    -
    196 
    -      <plugin>
    197 175 
             <groupId>org.nuiton.i18n</groupId>
    198 176 
             <artifactId>i18n-maven-plugin</artifactId>
    199 177 
             <executions>

  • services/pom.xml
    ... ... @@ -120,20 +120,7 @@
    120 120 
       </dependencies>
    121 121
    122 122 
       <build>
    123 
    -    <resources>
    124 
    -      <resource>
    125 
    -        <directory>${project.build.directory}/generated-sources/resources/</directory>
    126 
    -        <includes>
    127 
    -          <include>objectmodel/*.properties</include>
    128 
    -        </includes>
    129 
    -      </resource>
    130 
    -      <resource>
    131 
    -        <directory>src/main/resources</directory>
    132 
    -        <includes>
    133 
    -          <include>**/*</include>
    134 
    -        </includes>
    135 
    -      </resource>
    136 
    -    </resources>
    123 
    +
    137 124 
         <plugins>
    138 125 
           <plugin>
    139 126 
             <groupId>org.apache.maven.plugins</groupId>
    ... ... @@ -173,12 +160,10 @@
    173 160 
                     <inputs>
    174 161 
                       <input>friend</input>
    175 162 
                     </inputs>
    176 
    -                <!--<resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>-->
    177 163 
                     <templates>org.nuiton.eugene.java.BeanTransformer</templates>
    178 164 
                     <failIfUnsafe>true</failIfUnsafe>
    179 165 
                     <defaultPackage>fr.ird.observe.services.dto</defaultPackage>
    180 166 
                     <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath>
    181 
    -                <!--<modelExtensionFile>../services/src/main/xmi/observe-services-dto.ini</modelExtensionFile>-->
    182 167 
                   </configuration>
    183 168 
                   <goals>
    184 169 
                     <goal>generate</goal>

  • test/pom.xml
    ... ... @@ -67,23 +67,4 @@
    67 67
    68 68 
       </dependencies>
    69 69
    70 
    -  <build>
    71 
    -    <resources>
    72 
    -      <resource>
    73 
    -        <directory>src/main/filtered-resources</directory>
    74 
    -        <filtering>true</filtering>
    75 
    -        <includes>
    76 
    -          <include>**/*</include>
    77 
    -        </includes>
    78 
    -      </resource>
    79 
    -      <resource>
    80 
    -        <directory>src/main/resources</directory>
    81 
    -        <includes>
    82 
    -          <include>**/*</include>
    83 
    -        </includes>
    84 
    -      </resource>
    85 
    -    </resources>
    86 
    -
    87 
    -  </build>
    88 
    -
    89 70 
     </project>

  • topia-extension/pom.xml
    ... ... @@ -84,12 +84,6 @@
    84 84 
           <artifactId>HikariCP</artifactId>
    85 85 
         </dependency>
    86 86
    87 
    -    <!--dependency>
    88 
    -      <groupId>com.mchange</groupId>
    89 
    -      <artifactId>c3p0</artifactId>
    90 
    -      <scope>compile</scope>
    91 
    -    </dependency-->
    92 
    -
    93 87 
         <!-- test  -->
    94 88 
         <dependency>
    95 89 
           <groupId>junit</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.