This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit c3ec5989fd2ffb54edb7b3b0692d7379f651b8b0 Author: Maxim Solodovnik <[email protected]> AuthorDate: Mon Aug 29 11:50:11 2022 +0700 [OPENMEETINGS-2732] ical4j, oracle and postgress DB driver, LDAP API, slf4j, logback and bytebuddy --- .../apache/openmeetings/util/OMContextListener.java | 2 +- openmeetings-web/src/main/front/chat/package.json | 2 +- openmeetings-web/src/main/front/main/package.json | 2 +- openmeetings-web/src/main/front/room/package.json | 2 +- openmeetings-web/src/main/front/settings/package.json | 2 +- pom.xml | 18 +++++++++--------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java index c89ee9cc4..409de1771 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java @@ -43,8 +43,8 @@ public class OMContextListener implements ServletContextListener { System.setProperty(LOG_DIR_PROP, "logs"); } System.setProperty("webapp.contextPath", String.format("/%s", ctx)); - LoggerContext context = (LoggerContext)LoggerFactory.getILoggerFactory(); try { + LoggerContext context = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(context); context.reset(); diff --git a/openmeetings-web/src/main/front/chat/package.json b/openmeetings-web/src/main/front/chat/package.json index 52f0c0d1b..124eb4746 100644 --- a/openmeetings-web/src/main/front/chat/package.json +++ b/openmeetings-web/src/main/front/chat/package.json @@ -13,6 +13,6 @@ "rat-license": "Licensed under the Apache License, Version 2.0 (the \"License\") http://www.apache.org/licenses/LICENSE-2.0";, "devDependencies": { "browserify": "^17.0.0", - "tinyify": "^3.0.0" + "tinyify": "^3.1.0" } } diff --git a/openmeetings-web/src/main/front/main/package.json b/openmeetings-web/src/main/front/main/package.json index 8035965de..f56e781fc 100644 --- a/openmeetings-web/src/main/front/main/package.json +++ b/openmeetings-web/src/main/front/main/package.json @@ -13,7 +13,7 @@ "rat-license": "Licensed under the Apache License, Version 2.0 (the \"License\") http://www.apache.org/licenses/LICENSE-2.0";, "devDependencies": { "browserify": "^17.0.0", - "tinyify": "^3.0.0" + "tinyify": "^3.1.0" }, "dependencies": { "ua-parser-js": "^1.0.2" diff --git a/openmeetings-web/src/main/front/room/package.json b/openmeetings-web/src/main/front/room/package.json index fe51d38bd..057126848 100644 --- a/openmeetings-web/src/main/front/room/package.json +++ b/openmeetings-web/src/main/front/room/package.json @@ -13,7 +13,7 @@ "rat-license": "Licensed under the Apache License, Version 2.0 (the \"License\") http://www.apache.org/licenses/LICENSE-2.0";, "devDependencies": { "browserify": "^17.0.0", - "tinyify": "^3.0.0" + "tinyify": "^3.1.0" }, "dependencies": { "nosleep.js": "^0.12.0" diff --git a/openmeetings-web/src/main/front/settings/package.json b/openmeetings-web/src/main/front/settings/package.json index 8bf2e89e0..c45a30778 100644 --- a/openmeetings-web/src/main/front/settings/package.json +++ b/openmeetings-web/src/main/front/settings/package.json @@ -13,7 +13,7 @@ "rat-license": "Licensed under the Apache License, Version 2.0 (the \"License\") http://www.apache.org/licenses/LICENSE-2.0";, "devDependencies": { "browserify": "^17.0.0", - "tinyify": "^3.0.0" + "tinyify": "^3.1.0" }, "dependencies": { "adapterjs": "^0.15.5", diff --git a/pom.xml b/pom.xml index 46913a2c6..c6a176a79 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version> <jacoco-maven-plugin.versoin>0.8.8</jacoco-maven-plugin.versoin> <forbiddenapis.version>3.3</forbiddenapis.version> - <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version> + <maven-checkstyle-plugin.version>3.2.0</maven-checkstyle-plugin.version> <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version> <swagger-plugin.version>2.1.6</swagger-plugin.version> <!-- dependency versions --> @@ -87,7 +87,7 @@ <font-awesome.version>6.1.2</font-awesome.version> <spring.version>5.3.22</spring.version> <tomcat.version>9.0.65</tomcat.version> - <ical4j.version>4.0.0-beta1</ical4j.version> + <ical4j.version>4.0.0-beta2</ical4j.version> <cxf.version>3.5.3</cxf.version> <io.prometheus.version>0.16.0</io.prometheus.version> <aspectjtools.version>1.9.9.1</aspectjtools.version> @@ -106,18 +106,18 @@ <dom4j.version>2.1.3</dom4j.version> <commons-codec.version>1.15</commons-codec.version> <commons-io.version>2.11.0</commons-io.version> - <postgresql.version>42.4.1</postgresql.version> + <postgresql.version>42.5.0</postgresql.version> <mysql.version>8.0.30</mysql.version> <mssql.version>11.2.0.jre17</mssql.version> - <ojdbc.version>19.15.0.0.1</ojdbc.version> + <ojdbc.version>19.16.0.0</ojdbc.version> <commons-collections4.version>4.4</commons-collections4.version> <xstream.version>1.4.19</xstream.version> - <api-all.version>2.1.1</api-all.version> + <api-all.version>2.1.2</api-all.version> <caldav4j.version>1.0.5</caldav4j.version> <tika-parsers.version>2.4.1</tika-parsers.version> <commons-text.version>1.9</commons-text.version> - <slf4j.version>1.7.36</slf4j.version> - <logback.version>1.2.11</logback.version> + <slf4j.version>2.0.0</slf4j.version> + <logback.version>1.4.0</logback.version> <jetty.version>9.4.48.v20220622</jetty.version> <license.excludedScopes>test</license.excludedScopes> <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version> @@ -132,7 +132,7 @@ <jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version> <apacheds-test-framework.version>2.0.0.AM26</apacheds-test-framework.version> <swagger.version>2.2.2</swagger.version> - <bytebuddy.version>1.12.13</bytebuddy.version> + <bytebuddy.version>1.12.14</bytebuddy.version> <annotation-api.version>1.3.2</annotation-api.version> <!-- Exclude all generated code --> <sonar.exclusions>file:**/generated-sources/**, file:**/jquery-ui.css, file:**/cssemoticons.js, file:**/bootstrap-confirmation.js</sonar.exclusions> @@ -1237,7 +1237,7 @@ <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> - <version>10.3.1</version> <!-- FIXME TODO: should be removed after checkstyle plugin will be updated --> + <version>10.3.2</version> <!-- FIXME TODO: should be removed after checkstyle plugin will be updated --> </dependency> </dependencies> </plugin>
