Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3cc0792d by Tony Chemit at 2022-09-30T13:20:55+02:00 L'assistant sécurité 9.0.7 ne fonctionne plus - Closes #2431 - - - - - e5e18144 by Tony Chemit at 2022-09-30T13:20:55+02:00 update hibernate - - - - - b77e0641 by Tony Chemit at 2022-09-30T13:20:55+02:00 update slf4j and pom - - - - - f0b7e8a9 by Tony Chemit at 2022-09-30T13:20:55+02:00 update jts - - - - - c49a8b4f by Tony Chemit at 2022-09-30T13:25:52+02:00 L'assistant sécurité 9.0.7 ne fonctionne plus - See #2431 (add SecurityHelper in log info) - - - - - 23 changed files: - client/configuration/pom.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/datasource/actions/pom.xml - client/datasource/editor/api/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/test/pom.xml - core/services/client/pom.xml - core/services/local/pom.xml - model/src/main/resources/log4j2.xml - pom.xml - server/configuration-tools/pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/runner/src/main/resources/META-INF/configuration/log.xml - toolkit/api/pom.xml - toolkit/persistence/pom.xml - toolkit/persistence/src/main/java/org/nuiton/topia/persistence/security/SecurityScriptHelper.java - toolkit/plugin/pom.xml - toolkit/templates/pom.xml Changes: ===================================== client/configuration/pom.xml ===================================== @@ -140,7 +140,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== client/configuration/src/main/filtered-resources/observe-log4j2.xml ===================================== @@ -127,6 +127,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="org.nuiton.topia.persistence.TopiaApplicationContextFactory" level="info" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client/datasource/actions/pom.xml ===================================== @@ -141,7 +141,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== client/datasource/editor/api/pom.xml ===================================== @@ -208,7 +208,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== client/runner/pom.xml ===================================== @@ -116,7 +116,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== core/api/dto/pom.xml ===================================== @@ -122,7 +122,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== core/api/tree/pom.xml ===================================== @@ -83,7 +83,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> <dependency> ===================================== core/api/validation/pom.xml ===================================== @@ -104,7 +104,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> <dependency> @@ -196,17 +196,17 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <artifactId>log4j-slf4j2-impl</artifactId> + <version>${lib.version.log4j2}</version> </dependency> </dependencies> </plugin> ===================================== core/persistence/java/pom.xml ===================================== @@ -183,7 +183,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== core/persistence/test/pom.xml ===================================== @@ -84,7 +84,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== core/services/client/pom.xml ===================================== @@ -238,7 +238,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== core/services/local/pom.xml ===================================== @@ -146,7 +146,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== model/src/main/resources/log4j2.xml ===================================== @@ -51,6 +51,9 @@ <Logger name="org.nuiton.topia.persistence.TopiaApplicationContextFactory" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> + <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false"> + <AppenderRef ref="console"/> + </Logger> <Root level="warn"> <AppenderRef ref="console"/> </Root> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.85</version> + <version>2022.87</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -119,17 +119,16 @@ <lib.version.h2>1.4.196</lib.version.h2> <!-- FIXME can't use 1.4.197 (date has changed + blob also)--> <!-- FIXME <lib.version.h2>2.1.210</lib.version.h2>--> - <lib.version.hibernate>5.6.11.Final</lib.version.hibernate> + <lib.version.hibernate>5.6.12.Final</lib.version.hibernate> <!-- FIXME <lib.version.hibernate>6.1.0.Final</lib.version.hibernate>--> <lib.version.jaxb-api>2.4.0-b180830.0359</lib.version.jaxb-api> <lib.version.jaxb-runtime>2.4.0-b180830.0438</lib.version.jaxb-runtime> <!-- FIXME <lib.version.jaxb-api>4.0.0</lib.version.jaxb-runtime>--> <!-- FIXME <lib.version.jaxb-runtime>4.0.0</lib.version.jaxb-runtime>--> - <lib.version.jts>1.16.0</lib.version.jts> + <lib.version.jts>1.16.1</lib.version.jts> <!-- FIXME <lib.version.jts>1.18.2</lib.version.jts>--> <!-- FIXME Reuse the last log4j for eugene--> <lib.version.java4all.eugene>3.0-alpha-42</lib.version.java4all.eugene> - <lib.version.log4j2.eugene>2.17.2</lib.version.log4j2.eugene> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> @@ -554,12 +553,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${lib.version.log4j2}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <version>${lib.version.log4j2}</version> </dependency> <dependency> @@ -1105,22 +1099,22 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <artifactId>log4j-slf4j2-impl</artifactId> + <version>${lib.version.log4j2}</version> </dependency> </dependencies> </plugin> ===================================== server/configuration-tools/pom.xml ===================================== @@ -76,7 +76,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== server/configuration/pom.xml ===================================== @@ -86,7 +86,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== server/core/pom.xml ===================================== @@ -133,7 +133,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== server/runner/src/main/resources/META-INF/configuration/log.xml ===================================== @@ -98,6 +98,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Root level="error"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== toolkit/api/pom.xml ===================================== @@ -176,7 +176,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== toolkit/persistence/pom.xml ===================================== @@ -119,7 +119,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> <dependency> ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/persistence/security/SecurityScriptHelper.java ===================================== @@ -180,7 +180,7 @@ public class SecurityScriptHelper { throw new TopiaException(String.format("Can't generate security script at %s", scriptPath), e); } try { - securityHelper.jdbcHelper().consume(SqlScriptConsumer.of(scriptPath)); + securityHelper.jdbcHelper().consume(SqlScriptConsumer.builder(scriptPath).commit().build()); } catch (SQLException e) { throw new TopiaException(String.format("Can't consume security script at %s", scriptPath), e); } ===================================== toolkit/plugin/pom.xml ===================================== @@ -166,7 +166,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== toolkit/templates/pom.xml ===================================== @@ -134,7 +134,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ce9e6ac52ad147d94a738dc2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ce9e6ac52ad147d94a738dc2... You're receiving this email because of your account on gitlab.com.