[jira] [Commented] (OPENMEETINGS-2756) Migration to Jakarta
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2756?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17678071#comment-17678071 ] ASF subversion and git services commented on OPENMEETINGS-2756: --- Commit af3a454295305abdb6ce86121a3505624f245256 in openmeetings's branch refs/heads/spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=af3a45429 ] [OPENMEETINGS-2756] spring, cxf, tomcat, wicket > 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)
[jira] [Commented] (OPENMEETINGS-2732) (7.0.0) Libraries should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17678070#comment-17678070 ] ASF subversion and git services commented on OPENMEETINGS-2732: --- Commit fdabf606bca5345c8c1403adbe6a9874890716dc in openmeetings's branch refs/heads/spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fdabf606b ] [OPENMEETINGS-2732] mockito > (7.0.0) Libraries should be updated > --- > > Key: OPENMEETINGS-2732 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2732 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Libraries should be updated -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2756) Migration to Jakarta
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2756?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17678073#comment-17678073 ] ASF subversion and git services commented on OPENMEETINGS-2756: --- Commit 9ddc4375383e9f6ec801597429371cb270bd20ac in openmeetings's branch refs/heads/spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=9ddc43753 ] [OPENMEETINGS-2756] prometheus is back, code clean-up > 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)
[jira] [Commented] (OPENMEETINGS-2756) Migration to Jakarta
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2756?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17678072#comment-17678072 ] ASF subversion and git services commented on OPENMEETINGS-2756: --- Commit 489ec99bbf8bf24721c81765869c4d9315df3802 in openmeetings's branch refs/heads/spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=489ec99bb ] [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav > 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] 04/06: spring is updated
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 42ce318615d7fc9c0f7705392271d6a8dddaffb8 Author: Maxim Solodovnik AuthorDate: Fri Jan 13 23:22:23 2023 +0700 spring is updated --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d0635c9a..c7aa81a06 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 10.0.0-SNAPSHOT 7.0.0-SNAPSHOT 6.2.0 - 6.0.3 + 6.0.4 10.1.4 4.0.0-beta5 4.0.0
[openmeetings] 03/06: javax.annotation -> jakarta.annotation
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit dccb0fc8650ded5009091b79fbae22e9a7c407a8 Author: Maxim Solodovnik AuthorDate: Fri Jan 13 23:08:00 2023 +0700 javax.annotation -> jakarta.annotation --- openmeetings-core/pom.xml | 4 .../src/main/java/org/apache/openmeetings/core/sip/SipManager.java | 4 ++-- .../java/org/apache/openmeetings/mediaserver/KurentoHandler.java| 4 ++-- .../openmeetings/service/calendar/caldav/AppointmentManager.java| 2 +- .../java/org/apache/openmeetings/service/notifier/MailNotifier.java | 2 +- .../java/org/apache/openmeetings/service/notifier/TextNotifier.java | 2 +- .../src/main/java/org/apache/openmeetings/web/app/OtpManager.java | 2 +- .../src/main/java/org/apache/openmeetings/web/app/TimerService.java | 2 +- .../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 1 + .../src/main/webapp/WEB-INF/classes/applicationContext.xml | 2 +- .../java/org/apache/openmeetings/webservice/NetTestWebService.java | 2 +- pom.xml | 6 ++ 12 files changed, 22 insertions(+), 11 deletions(-) diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml index 0d4590ed9..93f31deeb 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -49,6 +49,10 @@ + + jakarta.annotation + jakarta.annotation-api + org.apache.openmeetings openmeetings-db diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java index 68358aa16..ef1a61d27 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java @@ -25,8 +25,8 @@ import java.util.BitSet; import java.util.Optional; import java.util.function.Function; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.User; diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java index 33fd09c0f..957d33abe 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java @@ -36,8 +36,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java index c425eb90f..f90eb26b9 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.apache.http.HttpResponse; import org.apache.http.auth.AuthScope; diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java index 131e786f5..9649e2042 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java @@ -22,7 +22,7 @@ import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone; import java.util.TimeZone; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.apache.openmeetings.core.notifier.INotifier; import org.apache.openmeetings.core.notifier.NotifierService; diff --git
[openmeetings] 05/06: [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 489ec99bbf8bf24721c81765869c4d9315df3802 Author: Maxim Solodovnik AuthorDate: Tue Jan 17 20:55:46 2023 +0700 [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav --- LICENSE| 124 - openmeetings-core/pom.xml | 4 - openmeetings-install/pom.xml | 6 - .../src/site/xdoc/BuildInstructions.xml| 8 +- openmeetings-web/pom.xml | 4 - pom.xml| 12 -- 6 files changed, 4 insertions(+), 154 deletions(-) diff --git a/LICENSE b/LICENSE index 036575ded..3fd7d6e20 100644 --- a/LICENSE +++ b/LICENSE @@ -299,130 +299,6 @@ conditions of the following licenses. == -For GlassFish components - -webapps/openmeetings/WEB-INF/lib/activation-*.jar -webapps/openmeetings/WEB-INF/lib/javax.mail-1.6.0.jar - - -COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - -1. Definitions. - -1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications. - -1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. - -1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. - -1.4. Executable means the Covered Software in any form other than Source Code. - -1.5. Initial Developer means the individual or entity that first makes Original Software available under this License. - -1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. - -1.7. License means this document. - -1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. - -1.9. Modifications means the Source Code and Executable form of any of the following: - -A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; - -B. Any new file that contains any part of the Original Software or previous Modification; or - -C. Any new file that is contributed or otherwise made available under the terms of this License. - -1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License. - -1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. - -1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. - -1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)�the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty percent (50%) of the outstanding sh [...] - -2. License Grants. - -2.1. The Initial Developer Grant. -Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: -(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). -(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License. -(d) Notwithstanding Section�2.1(b) above, no patent license is granted: (1)�for
[openmeetings] 06/06: [OPENMEETINGS-2756] prometheus is back, code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 9ddc4375383e9f6ec801597429371cb270bd20ac
Author: Maxim Solodovnik
AuthorDate: Wed Jan 18 12:32:23 2023 +0700
[OPENMEETINGS-2756] prometheus is back, code clean-up
---
openmeetings-core/pom.xml | 6 --
openmeetings-util/pom.xml | 2 +-
.../openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java | 4 ++--
openmeetings-web/src/main/webapp/WEB-INF/web.xml| 2 +-
pom.xml | 2 +-
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 63b4639b0..6c3ceed8d 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -93,12 +93,6 @@
javax.sip
jain-sip-ri
-
-
- com.sun.activation
- jakarta.activation
- 2.0.1
-
org.junit.jupiter
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 11f0d4473..f8581a24c 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -133,7 +133,7 @@
io.prometheus
- simpleclient_servlet
+ simpleclient_servlet_jakarta
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
index ed6375beb..f068ddbbc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
@@ -18,9 +18,9 @@
*/
package org.apache.openmeetings.web.util.logging;
-//INCOMPATIBLE with Jackarta! import
io.prometheus.client.exporter.MetricsServlet;
+import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet;
-public class OpenMeetingsMetricsServlet /*extends MetricsServlet*/ {
+public class OpenMeetingsMetricsServlet extends MetricsServlet {
private static final long serialVersionUID = 1L;
public OpenMeetingsMetricsServlet() {
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
index 6877a51da..7dbe3091b 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
@@ -60,7 +60,7 @@
[openmeetings] branch spring-6 updated (df8efe614 -> 9ddc43753)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git discard df8efe614 [OPENMEETINGS-2756] prometheus is back, code clean-up discard 384ebc0a9 [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav discard cb08b9049 spring is updated discard fe59ca969 javax.annotation -> jakarta.annotation discard b8c8800fd Project is compilable, tests are RED discard 7a033c97f [OPENMEETINGS-2756] spring, cxf, tomcat, wicket add fdabf606b [OPENMEETINGS-2732] mockito new af3a45429 [OPENMEETINGS-2756] spring, cxf, tomcat, wicket new 555bc3684 Project is compilable, tests are RED new dccb0fc86 javax.annotation -> jakarta.annotation new 42ce31861 spring is updated new 489ec99bb [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav new 9ddc43753 [OPENMEETINGS-2756] prometheus is back, code clean-up This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (df8efe614) \ N -- N -- N refs/heads/spring-6 (9ddc43753) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] 01/06: [OPENMEETINGS-2756] spring, cxf, tomcat, wicket
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit af3a454295305abdb6ce86121a3505624f245256 Author: Maxim Solodovnik AuthorDate: Thu Dec 29 13:34:15 2022 +0700 [OPENMEETINGS-2756] spring, cxf, tomcat, wicket --- .../java/org/apache/openmeetings/IApplication.java | 2 +- .../openmeetings/db/util/ApplicationHelper.java| 6 ++--- openmeetings-server/pom.xml| 2 +- .../calendar/caldav/AppointmentManager.java| 4 ++-- .../calendar/caldav/handler/CtagHandler.java | 2 +- .../calendar/caldav/handler/EtagsHandler.java | 6 ++--- .../calendar/caldav/handler/MultigetHandler.java | 2 +- .../calendar/caldav/handler/WebDAVSyncHandler.java | 8 +++ .../openmeetings/util/OMContextListener.java | 4 ++-- .../web/common/upload/UploadResourceReference.java | 2 +- .../web/room/GroupCustomCssResourceReference.java | 2 +- .../openmeetings/web/user/chat/ChatToolbar.java| 2 +- .../web/util/FileItemResourceReference.java| 2 +- .../web/util/GroupLogoResourceReference.java | 2 +- .../web/util/ProfileImageResourceReference.java| 2 +- .../org/apache/openmeetings/backup/TestExport.java | 4 ++-- .../web/app/TestOmAuthenticationStrategy.java | 2 +- .../webservice/AbstractWebServiceTest.java | 11 - .../webservice/TestCalendarService.java| 4 ++-- .../openmeetings/webservice/TestErrorService.java | 2 +- .../openmeetings/webservice/TestGroupService.java | 8 +++ .../openmeetings/webservice/TestUserService.java | 6 ++--- .../webservice/CalendarWebService.java | 24 +-- .../openmeetings/webservice/ErrorWebService.java | 20 .../openmeetings/webservice/FileWebService.java| 24 +-- .../openmeetings/webservice/GroupWebService.java | 22 +- .../openmeetings/webservice/InfoWebService.java| 12 +- .../openmeetings/webservice/NetTestWebService.java | 19 +++ .../webservice/RecordingWebService.java| 20 .../openmeetings/webservice/RoomWebService.java| 27 ++ .../openmeetings/webservice/UserWebService.java| 24 +-- .../openmeetings/webservice/WbWebService.java | 23 +- .../webservice/error/ServiceException.java | 2 +- .../util/AppointmentListMessageBodyWriter.java | 10 .../util/AppointmentMessageBodyReader.java | 10 .../util/AppointmentMessageBodyWriter.java | 10 .../webservice/util/AppointmentParamConverter.java | 2 +- .../webservice/util/CalendarParamConverter.java| 2 +- .../webservice/util/DateParamConverter.java| 2 +- .../webservice/util/OmExceptionHandler.java| 4 ++-- .../webservice/util/OmParamConverterProvider.java | 4 ++-- .../webservice/util/RateLimitRequestFilter.java| 15 ++-- .../openmeetings/webservice/util/RateLimited.java | 2 +- .../webservice/util/UserMessageBodyWriter.java | 10 .../webservice/util/UserParamConverter.java| 2 +- pom.xml| 26 ++--- 46 files changed, 200 insertions(+), 201 deletions(-) diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java index d078f2945..fb0695fa1 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java @@ -23,7 +23,7 @@ import java.util.Set; import java.util.function.Supplier; import javax.annotation.Nonnull; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.util.ws.IClusterWsMessage; diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java index d63c6c20a..6769691e9 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java @@ -29,9 +29,9 @@ import java.util.Enumeration; import java.util.Map; import java.util.UUID; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import org.apache.openmeetings.IApplication; import org.apache.openmeetings.IWebSession; diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index
[jira] [Commented] (OPENMEETINGS-2756) Migration to Jakarta
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2756?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17678069#comment-17678069 ] ASF subversion and git services commented on OPENMEETINGS-2756: --- Commit df8efe614fb608e549beee0a9921d6042ead649f in openmeetings's branch refs/heads/spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=df8efe614 ] [OPENMEETINGS-2756] prometheus is back, code clean-up > 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 spring-6 updated (9dae3029a -> df8efe614)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git discard 9dae3029a [WICKET-7025] prometheus is back, code clean-up new df8efe614 [OPENMEETINGS-2756] prometheus is back, code clean-up This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9dae3029a) \ N -- N -- N refs/heads/spring-6 (df8efe614) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[openmeetings] 01/01: [OPENMEETINGS-2756] prometheus is back, code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit df8efe614fb608e549beee0a9921d6042ead649f
Author: Maxim Solodovnik
AuthorDate: Wed Jan 18 12:32:23 2023 +0700
[OPENMEETINGS-2756] prometheus is back, code clean-up
---
openmeetings-core/pom.xml | 6 --
openmeetings-util/pom.xml | 2 +-
.../openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java | 4 ++--
openmeetings-web/src/main/webapp/WEB-INF/web.xml| 2 +-
pom.xml | 2 +-
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 63b4639b0..6c3ceed8d 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -93,12 +93,6 @@
javax.sip
jain-sip-ri
-
-
- com.sun.activation
- jakarta.activation
- 2.0.1
-
org.junit.jupiter
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 11f0d4473..f8581a24c 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -133,7 +133,7 @@
io.prometheus
- simpleclient_servlet
+ simpleclient_servlet_jakarta
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
index ed6375beb..f068ddbbc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
@@ -18,9 +18,9 @@
*/
package org.apache.openmeetings.web.util.logging;
-//INCOMPATIBLE with Jackarta! import
io.prometheus.client.exporter.MetricsServlet;
+import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet;
-public class OpenMeetingsMetricsServlet /*extends MetricsServlet*/ {
+public class OpenMeetingsMetricsServlet extends MetricsServlet {
private static final long serialVersionUID = 1L;
public OpenMeetingsMetricsServlet() {
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
index 6877a51da..7dbe3091b 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
@@ -60,7 +60,7 @@
[openmeetings] branch spring-6 updated: [WICKET-7025] prometheus is back, code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/spring-6 by this push:
new 9dae3029a [WICKET-7025] prometheus is back, code clean-up
9dae3029a is described below
commit 9dae3029a1bbca2adf0ad3f836da8db4b1e0e6f6
Author: Maxim Solodovnik
AuthorDate: Wed Jan 18 12:32:23 2023 +0700
[WICKET-7025] prometheus is back, code clean-up
---
openmeetings-core/pom.xml | 6 --
openmeetings-util/pom.xml | 2 +-
.../openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java | 4 ++--
openmeetings-web/src/main/webapp/WEB-INF/web.xml| 2 +-
pom.xml | 2 +-
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 63b4639b0..6c3ceed8d 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -93,12 +93,6 @@
javax.sip
jain-sip-ri
-
-
- com.sun.activation
- jakarta.activation
- 2.0.1
-
org.junit.jupiter
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 11f0d4473..f8581a24c 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -133,7 +133,7 @@
io.prometheus
- simpleclient_servlet
+ simpleclient_servlet_jakarta
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
index ed6375beb..f068ddbbc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
@@ -18,9 +18,9 @@
*/
package org.apache.openmeetings.web.util.logging;
-//INCOMPATIBLE with Jackarta! import
io.prometheus.client.exporter.MetricsServlet;
+import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet;
-public class OpenMeetingsMetricsServlet /*extends MetricsServlet*/ {
+public class OpenMeetingsMetricsServlet extends MetricsServlet {
private static final long serialVersionUID = 1L;
public OpenMeetingsMetricsServlet() {
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
index 6877a51da..7dbe3091b 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
@@ -60,7 +60,7 @@
[jira] [Commented] (OPENMEETINGS-2732) (7.0.0) Libraries should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=1767#comment-1767 ] ASF subversion and git services commented on OPENMEETINGS-2732: --- Commit fdabf606bca5345c8c1403adbe6a9874890716dc in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fdabf606b ] [OPENMEETINGS-2732] mockito > (7.0.0) Libraries should be updated > --- > > Key: OPENMEETINGS-2732 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2732 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Libraries should be updated -- This message was sent by Atlassian Jira (v8.20.10#820010)
[openmeetings] branch master updated: [OPENMEETINGS-2732] mockito
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 fdabf606b [OPENMEETINGS-2732] mockito fdabf606b is described below commit fdabf606bca5345c8c1403adbe6a9874890716dc Author: Maxim Solodovnik AuthorDate: Tue Jan 17 21:06:40 2023 +0700 [OPENMEETINGS-2732] mockito --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f5911e2c..dc69a4696 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ 9.4.50.v20221201 test 1.70 - 4.11.0 + 5.0.0 2.3.2 6.18.0 1.2.307
[jira] [Commented] (OPENMEETINGS-2756) Migration to Jakarta
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2756?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=1764#comment-1764 ] ASF subversion and git services commented on OPENMEETINGS-2756: --- Commit 384ebc0a9a9e65d7c066a043e80b1b6530736238 in openmeetings's branch refs/heads/spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=384ebc0a9 ] [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav > 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 spring-6 updated: [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/spring-6 by this push: new 384ebc0a9 [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav 384ebc0a9 is described below commit 384ebc0a9a9e65d7c066a043e80b1b6530736238 Author: Maxim Solodovnik AuthorDate: Tue Jan 17 20:55:46 2023 +0700 [OPENMEETINGS-2756] build is green for me; trublemakers so far: wicket-ioc, prometheus, jackrabbit-webdav --- LICENSE| 124 - openmeetings-core/pom.xml | 4 - openmeetings-install/pom.xml | 6 - .../src/site/xdoc/BuildInstructions.xml| 8 +- openmeetings-web/pom.xml | 4 - pom.xml| 12 -- 6 files changed, 4 insertions(+), 154 deletions(-) diff --git a/LICENSE b/LICENSE index 036575ded..3fd7d6e20 100644 --- a/LICENSE +++ b/LICENSE @@ -299,130 +299,6 @@ conditions of the following licenses. == -For GlassFish components - -webapps/openmeetings/WEB-INF/lib/activation-*.jar -webapps/openmeetings/WEB-INF/lib/javax.mail-1.6.0.jar - - -COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - -1. Definitions. - -1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications. - -1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. - -1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. - -1.4. Executable means the Covered Software in any form other than Source Code. - -1.5. Initial Developer means the individual or entity that first makes Original Software available under this License. - -1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. - -1.7. License means this document. - -1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. - -1.9. Modifications means the Source Code and Executable form of any of the following: - -A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; - -B. Any new file that contains any part of the Original Software or previous Modification; or - -C. Any new file that is contributed or otherwise made available under the terms of this License. - -1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License. - -1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. - -1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. - -1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)�the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty percent (50%) of the outstanding sh [...] - -2. License Grants. - -2.1. The Initial Developer Grant. -Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: -(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). -(c) The licenses granted in Sections�2.1(a) and (b) are effective on
