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
The following commit(s) were added to refs/heads/master by this push:
new d8f2c74a9 [OPENMEETINGS-2780] junit, spring, tomcat, jetty, ical4j,
aspectjtools, openjpa, commons-codec, postgresql, mssql, ojdbc, api-all and
logback
d8f2c74a9 is described below
commit d8f2c74a9590f3edab1442d6a71a05d38d45c0ee
Author: Maxim Solodovnik <solo...@apache.org>
AuthorDate: Tue Feb 27 12:25:52 2024 +0700
[OPENMEETINGS-2780] junit, spring, tomcat, jetty, ical4j, aspectjtools,
openjpa, commons-codec, postgresql, mssql, ojdbc, api-all and logback
---
openmeetings-db/pom.xml | 1 -
pom.xml | 64 +++++++++++--------------------------------------
2 files changed, 14 insertions(+), 51 deletions(-)
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index dc4227624..37792b6af 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -53,7 +53,6 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
diff --git a/pom.xml b/pom.xml
index 66ac4013f..baf19266d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
- <exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
+ <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
<license-maven-plugin.version>2.4.0</license-maven-plugin.version>
<reflow-maven-skin.version>2.3.4</reflow-maven-skin.version>
@@ -82,25 +82,25 @@
<plexus-utils.version>3.5.1</plexus-utils.version>
<!-- dependency versions -->
- <junit.version>5.10.1</junit.version>
+ <junit.version>5.10.2</junit.version>
<wicket.version>10.0.0-M2</wicket.version>
<wicket-jquery-ui.version>10.0.0-M1</wicket-jquery-ui.version>
<wicketstuff.version>10.0.0-M2</wicketstuff.version>
<wicket-bootstrap.version>7.0.1</wicket-bootstrap.version>
- <spring.version>6.1.3</spring.version>
- <tomcat.version>10.1.18</tomcat.version>
- <jetty.version>11.0.19</jetty.version>
- <ical4j.version>4.0.0-rc3</ical4j.version>
+ <spring.version>6.1.4</spring.version>
+ <tomcat.version>10.1.19</tomcat.version>
+ <jetty.version>11.0.20</jetty.version>
+ <ical4j.version>4.0.0-rc4</ical4j.version>
<cxf.version>4.0.3</cxf.version>
<io.prometheus.version>1.1.0</io.prometheus.version>
- <aspectjtools.version>1.9.21</aspectjtools.version>
+ <aspectjtools.version>1.9.21.1</aspectjtools.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.5.4</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
<src.pack.skip>false</src.pack.skip>
<h2.version>2.2.224</h2.version>
<jakarta.mail.version>2.0.1</jakarta.mail.version>
- <openjpa.version>3.2.2</openjpa.version>
+ <openjpa.version>4.0.0</openjpa.version>
<jakarta.persistence.version>3.1.0</jakarta.persistence.version>
<jakarta.transaction.version>2.0.1</jakarta.transaction.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
@@ -110,23 +110,23 @@
<commons-dbcp.version>2.11.0</commons-dbcp.version>
<commons-pool2.version>2.12.0</commons-pool2.version>
<commons-cli.version>1.6.0</commons-cli.version>
- <commons-codec.version>1.16.0</commons-codec.version>
+ <commons-codec.version>1.16.1</commons-codec.version>
<commons-io.version>2.15.1</commons-io.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-text.version>1.11.0</commons-text.version>
<commons-net.version>3.10.0</commons-net.version>
<dom4j.version>2.1.4</dom4j.version>
- <postgresql.version>42.7.1</postgresql.version>
+ <postgresql.version>42.7.2</postgresql.version>
<mysql.version>8.3.0</mysql.version>
- <mssql.version>12.4.2.jre11</mssql.version>
- <ojdbc.version>19.21.0.0</ojdbc.version>
+ <mssql.version>12.6.1.jre11</mssql.version>
+ <ojdbc.version>19.22.0.0</ojdbc.version>
<xstream.version>1.4.20</xstream.version>
- <api-all.version>2.1.5</api-all.version>
+ <api-all.version>2.1.6</api-all.version>
<caldav4j.version>1.0.5</caldav4j.version>
<jackrabbit-webdav.version>2.21.22</jackrabbit-webdav.version>
<tika-parsers.version>3.0.0-BETA</tika-parsers.version>
<slf4j.version>2.0.9</slf4j.version>
- <logback.version>1.4.14</logback.version>
+ <logback.version>1.5.0</logback.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov.version>1.77</bcprov.version>
<mockito.version>5.2.0</mockito.version>
@@ -818,21 +818,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
-
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-jpa_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-jta_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
@@ -1518,27 +1503,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
-
<classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
-
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-jpa_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-jta_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-
<groupId>jakarta.persistence</groupId>
-
<artifactId>jakarta.persistence-api</artifactId>
-
<version>${jakarta.persistence.version}</version>
- </dependency>
- <dependency>
-
<groupId>jakarta.transaction</groupId>
-
<artifactId>jakarta.transaction-api</artifactId>
-
<version>${jakarta.transaction.version}</version>
</dependency>
</dependencies>
</plugin>
