[openmeetings] branch jakarta-spring-6 updated: Build is green
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/jakarta-spring-6 by this push:
new 36d0c26a4 Build is green
36d0c26a4 is described below
commit 36d0c26a4cf0d79e584e57fa98e1b1bfe63521ea
Author: Maxim Solodovnik
AuthorDate: Thu Sep 28 12:28:16 2023 +0700
Build is green
---
openmeetings-core/src/test/java/module-info.test | 3 +-
openmeetings-db/src/main/java/module-info.java | 1 +
.../apache/openmeetings/db/dao/user/UserDao.java | 2 +-
openmeetings-db/src/test/java/module-info.test | 4 +--
.../src/test/java/module-info.test | 3 +-
.../src/test/java/module-info.test | 3 +-
openmeetings-util/src/test/java/module-info.test | 4 +--
openmeetings-web/pom.xml | 4 +++
openmeetings-web/src/test/java/module-info.test| 3 +-
.../src/main/java/module-info.java | 1 +
.../src/test/java/module-info.test | 4 +--
pom.xml| 37 ++
12 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/openmeetings-core/src/test/java/module-info.test
b/openmeetings-core/src/test/java/module-info.test
index b76057d82..fb0ceeb30 100644
--- a/openmeetings-core/src/test/java/module-info.test
+++ b/openmeetings-core/src/test/java/module-info.test
@@ -17,7 +17,7 @@
* under the License.
*/
-module org.apache.openmeetings.core {
+open module org.apache.openmeetings.core {
// This one should be in-sync with module-info.java
exports org.apache.openmeetings.core.converter;
exports org.apache.openmeetings.core.data.file;
@@ -62,6 +62,5 @@ module org.apache.openmeetings.core {
requires org.slf4j;
//tests
- requires org.junit.jupiter.engine;
requires org.junit.jupiter.api;
}
diff --git a/openmeetings-db/src/main/java/module-info.java
b/openmeetings-db/src/main/java/module-info.java
index b31f406ef..622b7a9b0 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -78,5 +78,6 @@ module org.apache.openmeetings.db {
requires jakarta.servlet;
requires jakarta.xml.bind;
+ requires org.dom4j;
requires org.slf4j;
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 9b2a51cc8..64212363e 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -598,7 +598,7 @@ public class UserDao implements
IGroupAdminDataProviderDao {
/**
* login logic
*
-* @param userOrEmail - login or email of the user being tested
+* @param _userOrEmail - login or email of the user being tested
* @param userpass - password of the user being tested
* @return User object in case of successful login
* @throws OmException in case of any issue
diff --git a/openmeetings-db/src/test/java/module-info.test
b/openmeetings-db/src/test/java/module-info.test
index df483e26a..fd9ed1196 100644
--- a/openmeetings-db/src/test/java/module-info.test
+++ b/openmeetings-db/src/test/java/module-info.test
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-module org.apache.openmeetings.db {
+open module org.apache.openmeetings.db {
// This one should be in-sync with module-info.java
exports org.apache.openmeetings;
exports org.apache.openmeetings.db.bind;
@@ -79,9 +79,9 @@ module org.apache.openmeetings.db {
requires jakarta.servlet;
requires jakarta.xml.bind;
+ requires org.dom4j;
requires org.slf4j;
//tests
- requires org.junit.jupiter.engine;
requires org.junit.jupiter.api;
}
diff --git a/openmeetings-install/src/test/java/module-info.test
b/openmeetings-install/src/test/java/module-info.test
index 6625f6c4d..7841b5f3c 100644
--- a/openmeetings-install/src/test/java/module-info.test
+++ b/openmeetings-install/src/test/java/module-info.test
@@ -17,7 +17,7 @@
* under the License.
*/
-module org.apache.openmeetings.install {
+open module org.apache.openmeetings.install {
// This one should be in-sync with module-info.java
exports org.apache.openmeetings.backup;
exports org.apache.openmeetings.cli;
@@ -53,6 +53,5 @@ module org.apache.openmeetings.install {
requires org.slf4j;
//tests
- requires org.junit.jupiter.engine;
requires org.junit.jupiter.api;
}
diff --git a/openmeetings-mediaserver/src/test/java/module-info.test
b/openmeetings-mediaserver
[jira] [Commented] (OPENMEETINGS-2756) Migration to Jakarta
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2756?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17769563#comment-17769563 ] ASF subversion and git services commented on OPENMEETINGS-2756: --- Commit 6740bdca661ed53a3810fdc25463992a7662f6b1 in openmeetings's branch refs/heads/jakarta-spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=6740bdca6 ] [OPENMEETINGS-2756] audio/video is fixed; version is bumped > Migration to Jakarta > > > Key: OPENMEETINGS-2756 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2756 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > > Multiple components should be migrated to modern stack: > * spring > * wicket-10 > * cxf-4 > * tomcat-10 > * ... -- This message was sent by Atlassian Jira (v8.20.10#820010)
[openmeetings] branch jakarta-spring-6 updated: [OPENMEETINGS-2756] audio/video is fixed; version is bumped
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/jakarta-spring-6 by this push:
new 6740bdca6 [OPENMEETINGS-2756] audio/video is fixed; version is bumped
6740bdca6 is described below
commit 6740bdca661ed53a3810fdc25463992a7662f6b1
Author: Maxim Solodovnik
AuthorDate: Wed Sep 27 18:54:43 2023 +0700
[OPENMEETINGS-2756] audio/video is fixed; version is bumped
---
openmeetings-core/pom.xml | 2 +-
openmeetings-db/pom.xml| 2 +-
openmeetings-install/pom.xml | 2 +-
openmeetings-mediaserver/pom.xml | 2 +-
.../src/main/java/module-info.java | 1 +
.../openmeetings/mediaserver/IStreamProcessor.java | 24
.../org/apache/openmeetings/mediaserver/KRoom.java | 2 +-
.../openmeetings/mediaserver/KurentoHandler.java | 44 --
.../openmeetings/mediaserver/StreamProcessor.java | 18 +
.../mediaserver/StreamProcessorActions.java| 7 ++--
.../mediaserver/TestStreamProcessor.java | 11 +++---
.../src/test/java/module-info.test | 1 +
openmeetings-screenshare/pom.xml | 2 +-
openmeetings-server/pom.xml| 2 +-
openmeetings-service/pom.xml | 2 +-
openmeetings-util/pom.xml | 2 +-
openmeetings-web/pom.xml | 2 +-
openmeetings-webservice/pom.xml| 2 +-
pom.xml| 4 +-
19 files changed, 67 insertions(+), 65 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 7b3e47fa1..54a96621f 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -22,7 +22,7 @@
org.apache.openmeetings
openmeetings-parent
- 7.2.0-SNAPSHOT
+ 8.0.0-SNAPSHOT
..
openmeetings-core
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 416b02239..3ba12399c 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -22,7 +22,7 @@
org.apache.openmeetings
openmeetings-parent
- 7.2.0-SNAPSHOT
+ 8.0.0-SNAPSHOT
..
openmeetings-db
diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml
index f01dd5faa..3e37d0ed7 100644
--- a/openmeetings-install/pom.xml
+++ b/openmeetings-install/pom.xml
@@ -22,7 +22,7 @@
org.apache.openmeetings
openmeetings-parent
- 7.2.0-SNAPSHOT
+ 8.0.0-SNAPSHOT
..
openmeetings-install
diff --git a/openmeetings-mediaserver/pom.xml b/openmeetings-mediaserver/pom.xml
index 017679e2f..a38173417 100644
--- a/openmeetings-mediaserver/pom.xml
+++ b/openmeetings-mediaserver/pom.xml
@@ -22,7 +22,7 @@
org.apache.openmeetings
openmeetings-parent
- 7.2.0-SNAPSHOT
+ 8.0.0-SNAPSHOT
..
openmeetings-mediaserver
diff --git a/openmeetings-mediaserver/src/main/java/module-info.java
b/openmeetings-mediaserver/src/main/java/module-info.java
index 42f766fac..45dee43fb 100644
--- a/openmeetings-mediaserver/src/main/java/module-info.java
+++ b/openmeetings-mediaserver/src/main/java/module-info.java
@@ -36,6 +36,7 @@ module org.apache.openmeetings.mediaserver {
requires spring.beans;
requires spring.context;
+ requires spring.core;
requires kurento.client;
requires kurento.jsonrpc.client;
diff --git
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/IStreamProcessor.java
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/IStreamProcessor.java
deleted file mode 100644
index 6d6e65f96..0
---
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/IStreamProcessor.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express o
