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

Commits:

23 changed files:

Changes:

  • client/configuration/pom.xml
    ... ... @@ -140,7 +140,7 @@
    140 140 
         </dependency>
    141 141 
         <dependency>
    142 142 
           <groupId>org.apache.logging.log4j</groupId>
    143 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    143 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    144 144 
           <scope>test</scope>
    145 145 
         </dependency>
    146 146 
       </dependencies>

  • client/configuration/src/main/filtered-resources/observe-log4j2.xml
    ... ... @@ -127,6 +127,10 @@
    127 127 
                 <AppenderRef ref="console"/>
    128 128 
                 <AppenderRef ref="File"/>
    129 129 
             </Logger>
    130 
    +        <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false">
    131 
    +            <AppenderRef ref="console"/>
    132 
    +            <AppenderRef ref="File"/>
    133 
    +        </Logger>
    130 134 
             <Logger name="org.nuiton.topia.persistence.TopiaApplicationContextFactory" level="info" additivity="false">
    131 135 
                 <AppenderRef ref="console"/>
    132 136 
                 <AppenderRef ref="File"/>

  • client/datasource/actions/pom.xml
    ... ... @@ -141,7 +141,7 @@
    141 141 
         </dependency>
    142 142 
         <dependency>
    143 143 
           <groupId>org.apache.logging.log4j</groupId>
    144 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    144 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    145 145 
           <scope>runtime</scope>
    146 146 
         </dependency>
    147 147 
         <dependency>

  • client/datasource/editor/api/pom.xml
    ... ... @@ -208,7 +208,7 @@
    208 208 
         </dependency>
    209 209 
         <dependency>
    210 210 
           <groupId>org.apache.logging.log4j</groupId>
    211 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    211 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    212 212 
           <scope>runtime</scope>
    213 213 
         </dependency>
    214 214 
         <dependency>

  • client/runner/pom.xml
    ... ... @@ -116,7 +116,7 @@
    116 116 
         </dependency>
    117 117 
         <dependency>
    118 118 
           <groupId>org.apache.logging.log4j</groupId>
    119 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    119 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    120 120 
           <scope>runtime</scope>
    121 121 
         </dependency>
    122 122 
         <dependency>

  • core/api/dto/pom.xml
    ... ... @@ -122,7 +122,7 @@
    122 122 
         </dependency>
    123 123 
         <dependency>
    124 124 
           <groupId>org.apache.logging.log4j</groupId>
    125 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    125 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    126 126 
           <scope>runtime</scope>
    127 127 
         </dependency>
    128 128 
         <dependency>

  • core/api/tree/pom.xml
    ... ... @@ -83,7 +83,7 @@
    83 83 
         </dependency>
    84 84 
         <dependency>
    85 85 
           <groupId>org.apache.logging.log4j</groupId>
    86 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    86 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    87 87 
           <scope>test</scope>
    88 88 
         </dependency>
    89 89 
         <dependency>

  • core/api/validation/pom.xml
    ... ... @@ -104,7 +104,7 @@
    104 104 
         </dependency>
    105 105 
         <dependency>
    106 106 
           <groupId>org.apache.logging.log4j</groupId>
    107 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    107 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    108 108 
           <scope>test</scope>
    109 109 
         </dependency>
    110 110 
         <dependency>
    ... ... @@ -196,17 +196,17 @@
    196 196 
                 <dependency>
    197 197 
                   <groupId>org.apache.logging.log4j</groupId>
    198 198 
                   <artifactId>log4j-core</artifactId>
    199 
    -              <version>${lib.version.log4j2.eugene}</version>
    199 
    +              <version>${lib.version.log4j2}</version>
    200 200 
                 </dependency>
    201 201 
                 <dependency>
    202 202 
                   <groupId>org.apache.logging.log4j</groupId>
    203 203 
                   <artifactId>log4j-jcl</artifactId>
    204 
    -              <version>${lib.version.log4j2.eugene}</version>
    204 
    +              <version>${lib.version.log4j2}</version>
    205 205 
                 </dependency>
    206 206 
                 <dependency>
    207 207 
                   <groupId>org.apache.logging.log4j</groupId>
    208 
    -              <artifactId>log4j-slf4j-impl</artifactId>
    209 
    -              <version>${lib.version.log4j2.eugene}</version>
    208 
    +              <artifactId>log4j-slf4j2-impl</artifactId>
    209 
    +              <version>${lib.version.log4j2}</version>
    210 210 
                 </dependency>
    211 211 
               </dependencies>
    212 212 
             </plugin>

  • core/persistence/java/pom.xml
    ... ... @@ -183,7 +183,7 @@
    183 183 
         </dependency>
    184 184 
         <dependency>
    185 185 
           <groupId>org.apache.logging.log4j</groupId>
    186 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    186 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    187 187 
           <scope>test</scope>
    188 188 
         </dependency>
    189 189 
       </dependencies>

  • core/persistence/test/pom.xml
    ... ... @@ -84,7 +84,7 @@
    84 84 
         </dependency>
    85 85 
         <dependency>
    86 86 
           <groupId>org.apache.logging.log4j</groupId>
    87 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    87 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    88 88 
           <scope>runtime</scope>
    89 89 
         </dependency>
    90 90 
         <dependency>

  • core/services/client/pom.xml
    ... ... @@ -238,7 +238,7 @@
    238 238 
         </dependency>
    239 239 
         <dependency>
    240 240 
           <groupId>org.apache.logging.log4j</groupId>
    241 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    241 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    242 242 
           <scope>test</scope>
    243 243 
         </dependency>
    244 244 
       </dependencies>

  • core/services/local/pom.xml
    ... ... @@ -146,7 +146,7 @@
    146 146 
         </dependency>
    147 147 
         <dependency>
    148 148 
           <groupId>org.apache.logging.log4j</groupId>
    149 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    149 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    150 150 
           <scope>test</scope>
    151 151 
         </dependency>
    152 152 
       </dependencies>

  • model/src/main/resources/log4j2.xml
    ... ... @@ -51,6 +51,9 @@
    51 51 
         <Logger name="org.nuiton.topia.persistence.TopiaApplicationContextFactory" level="info" additivity="false">
    52 52 
           <AppenderRef ref="console"/>
    53 53 
         </Logger>
    54 
    +    <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false">
    55 
    +      <AppenderRef ref="console"/>
    56 
    +    </Logger>
    54 57 
         <Root level="warn">
    55 58 
           <AppenderRef ref="console"/>
    56 59 
         </Root>

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23 
       <parent>
    24 24 
         <groupId>io.ultreia.maven</groupId>
    25 25 
         <artifactId>pom</artifactId>
    26 
    -    <version>2022.85</version>
    26 
    +    <version>2022.87</version>
    27 27 
       </parent>
    28 28 
       <groupId>fr.ird.observe</groupId>
    29 29 
       <artifactId>ird-observe</artifactId>
    ... ... @@ -119,17 +119,16 @@
    119 119 
         <lib.version.h2>1.4.196</lib.version.h2>
    120 120 
         <!-- FIXME can't use 1.4.197 (date has changed + blob also)-->
    121 121 
         <!-- FIXME   <lib.version.h2>2.1.210</lib.version.h2>-->
    122 
    -    <lib.version.hibernate>5.6.11.Final</lib.version.hibernate>
    122 
    +    <lib.version.hibernate>5.6.12.Final</lib.version.hibernate>
    123 123 
         <!-- FIXME    <lib.version.hibernate>6.1.0.Final</lib.version.hibernate>-->
    124 124 
         <lib.version.jaxb-api>2.4.0-b180830.0359</lib.version.jaxb-api>
    125 125 
         <lib.version.jaxb-runtime>2.4.0-b180830.0438</lib.version.jaxb-runtime>
    126 126 
         <!-- FIXME   <lib.version.jaxb-api>4.0.0</lib.version.jaxb-runtime>-->
    127 127 
         <!-- FIXME   <lib.version.jaxb-runtime>4.0.0</lib.version.jaxb-runtime>-->
    128 
    -    <lib.version.jts>1.16.0</lib.version.jts>
    128 
    +    <lib.version.jts>1.16.1</lib.version.jts>
    129 129 
         <!-- FIXME   <lib.version.jts>1.18.2</lib.version.jts>-->
    130 130 
         <!--    FIXME Reuse the last log4j for eugene-->
    131 131 
         <lib.version.java4all.eugene>3.0-alpha-42</lib.version.java4all.eugene>
    132 
    -    <lib.version.log4j2.eugene>2.17.2</lib.version.log4j2.eugene>
    133 132 
         <!-- license header configuration -->
    134 133 
         <license.licenseName>gpl_v3</license.licenseName>
    135 134 
         <license.organizationName>IRD, Ultreia.io</license.organizationName>
    ... ... @@ -554,12 +553,7 @@
    554 553 
           </dependency>
    555 554 
           <dependency>
    556 555 
             <groupId>org.apache.logging.log4j</groupId>
    557 
    -        <artifactId>log4j-slf4j-impl</artifactId>
    558 
    -        <version>${lib.version.log4j2}</version>
    559 
    -      </dependency>
    560 
    -      <dependency>
    561 
    -        <groupId>org.apache.logging.log4j</groupId>
    562 
    -        <artifactId>log4j-slf4j18-impl</artifactId>
    556 
    +        <artifactId>log4j-slf4j2-impl</artifactId>
    563 557 
             <version>${lib.version.log4j2}</version>
    564 558 
           </dependency>
    565 559 
           <dependency>
    ... ... @@ -1105,22 +1099,22 @@
    1105 1099 
                 <dependency>
    1106 1100 
                   <groupId>org.apache.logging.log4j</groupId>
    1107 1101 
                   <artifactId>log4j-api</artifactId>
    1108 
    -              <version>${lib.version.log4j2.eugene}</version>
    1102 
    +              <version>${lib.version.log4j2}</version>
    1109 1103 
                 </dependency>
    1110 1104 
                 <dependency>
    1111 1105 
                   <groupId>org.apache.logging.log4j</groupId>
    1112 1106 
                   <artifactId>log4j-core</artifactId>
    1113 
    -              <version>${lib.version.log4j2.eugene}</version>
    1107 
    +              <version>${lib.version.log4j2}</version>
    1114 1108 
                 </dependency>
    1115 1109 
                 <dependency>
    1116 1110 
                   <groupId>org.apache.logging.log4j</groupId>
    1117 1111 
                   <artifactId>log4j-jcl</artifactId>
    1118 
    -              <version>${lib.version.log4j2.eugene}</version>
    1112 
    +              <version>${lib.version.log4j2}</version>
    1119 1113 
                 </dependency>
    1120 1114 
                 <dependency>
    1121 1115 
                   <groupId>org.apache.logging.log4j</groupId>
    1122 
    -              <artifactId>log4j-slf4j-impl</artifactId>
    1123 
    -              <version>${lib.version.log4j2.eugene}</version>
    1116 
    +              <artifactId>log4j-slf4j2-impl</artifactId>
    1117 
    +              <version>${lib.version.log4j2}</version>
    1124 1118 
                 </dependency>
    1125 1119 
               </dependencies>
    1126 1120 
             </plugin>

  • server/configuration-tools/pom.xml
    ... ... @@ -76,7 +76,7 @@
    76 76 
         </dependency>
    77 77 
         <dependency>
    78 78 
           <groupId>org.apache.logging.log4j</groupId>
    79 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    79 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    80 80 
           <scope>runtime</scope>
    81 81 
         </dependency>
    82 82 
         <dependency>

  • server/configuration/pom.xml
    ... ... @@ -86,7 +86,7 @@
    86 86 
         </dependency>
    87 87 
         <dependency>
    88 88 
           <groupId>org.apache.logging.log4j</groupId>
    89 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    89 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    90 90 
           <scope>test</scope>
    91 91 
         </dependency>
    92 92 
       </dependencies>

  • server/core/pom.xml
    ... ... @@ -133,7 +133,7 @@
    133 133 
         </dependency>
    134 134 
         <dependency>
    135 135 
           <groupId>org.apache.logging.log4j</groupId>
    136 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    136 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    137 137 
           <scope>runtime</scope>
    138 138 
         </dependency>
    139 139 
         <dependency>

  • server/runner/src/main/resources/META-INF/configuration/log.xml
    ... ... @@ -98,6 +98,10 @@
    98 98 
           <AppenderRef ref="console"/>
    99 99 
           <AppenderRef ref="File"/>
    100 100 
         </Logger>
    101 
    +    <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false">
    102 
    +      <AppenderRef ref="console"/>
    103 
    +      <AppenderRef ref="File"/>
    104 
    +    </Logger>
    101 105 
         <Root level="error">
    102 106 
           <AppenderRef ref="console"/>
    103 107 
           <AppenderRef ref="File"/>

  • toolkit/api/pom.xml
    ... ... @@ -176,7 +176,7 @@
    176 176 
         </dependency>
    177 177 
         <dependency>
    178 178 
           <groupId>org.apache.logging.log4j</groupId>
    179 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    179 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    180 180 
           <scope>test</scope>
    181 181 
         </dependency>
    182 182 
       </dependencies>

  • toolkit/persistence/pom.xml
    ... ... @@ -119,7 +119,7 @@
    119 119 
         </dependency>
    120 120 
         <dependency>
    121 121 
           <groupId>org.apache.logging.log4j</groupId>
    122 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    122 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    123 123 
           <scope>test</scope>
    124 124 
         </dependency>
    125 125 
         <dependency>

  • toolkit/persistence/src/main/java/org/nuiton/topia/persistence/security/SecurityScriptHelper.java
    ... ... @@ -180,7 +180,7 @@ public class SecurityScriptHelper {
    180 180 
                 throw new TopiaException(String.format("Can't generate security script at %s", scriptPath), e);
    181 181 
             }
    182 182 
             try {
    183 
    -            securityHelper.jdbcHelper().consume(SqlScriptConsumer.of(scriptPath));
    183 
    +            securityHelper.jdbcHelper().consume(SqlScriptConsumer.builder(scriptPath).commit().build());
    184 184 
             } catch (SQLException e) {
    185 185 
                 throw new TopiaException(String.format("Can't consume security script at %s", scriptPath), e);
    186 186 
             }

  • toolkit/plugin/pom.xml
    ... ... @@ -166,7 +166,7 @@
    166 166 
         </dependency>
    167 167 
         <dependency>
    168 168 
           <groupId>org.apache.logging.log4j</groupId>
    169 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    169 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    170 170 
           <scope>runtime</scope>
    171 171 
         </dependency>
    172 172 
         <dependency>

  • toolkit/templates/pom.xml
    ... ... @@ -134,7 +134,7 @@
    134 134 
         </dependency>
    135 135 
         <dependency>
    136 136 
           <groupId>org.apache.logging.log4j</groupId>
    137 
    -      <artifactId>log4j-slf4j18-impl</artifactId>
    137 
    +      <artifactId>log4j-slf4j2-impl</artifactId>
    138 138 
           <scope>test</scope>
    139 139 
         </dependency>
    140 140 
       </dependencies>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help