This is an automated email from the ASF dual-hosted git repository.

solomax pushed a change to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


 discard f9ae89f4b [OPENMEETINGS-2756] jackrabbit-webdav maven coordinates are 
updated, bcprov is updated
 discard 5f66d602c [OPENMEETINGS-2756] prometheus is back, code clean-up
 discard 3b050a3ca [OPENMEETINGS-2756] build is green for me; trublemakers so 
far: wicket-ioc, prometheus, jackrabbit-webdav
 discard 2931bcfb5 javax.annotation -> jakarta.annotation
 discard 2ad3b625e Project is compilable, tests are RED
 discard 3e2476b6e [OPENMEETINGS-2756] spring, cxf, tomcat, wicket
    omit 8f1173cf0 [OPENMEETINGS-2770] wicket, wicketstuff, wicket-bootstrap, 
asterisk, ojdbc, swagger, bytebuddy, maven plugins
    omit 77df42f4f fixes apache#188 - removed head tags fixed the style
    omit a2e5b6372 fixes #188 - removed head tags fixed the style
    omit f7c829e5c minor update #188 - .vscode/settings.json, style sass 
attibutes removed
    omit b73f721c2 update #188 - fixed the style and moved repeated div to 
parent template (AbstractTemplatePage)
    omit affd8589f update - removed inline styles and updated email templates - 
#188
    omit 186ba54f6 updated #188 - removed external resources and comments, 
added new line at end of files, style still in inline CSS
    omit 282893bed fixed #188
    omit f2497f3a1 [OPENMEETINGS-2770] commons-io, swagger, plugins
    omit 15d6e2947 [OPENMEETINGS-2774] initial commit to fix styles in the 
emails
    omit 5d9e8fb5f [OPENMEETINGS-2770] maven-assembly-plugin, tika
    omit 4de8f7c0a [OPENMEETINGS-2773] login/email should be case insensitive
    omit e014c78d2 [OPENMEETINGS-2770] jacoco
    omit 1d58ad44c [OPENMEETINGS-2770] tomcat
    omit 45995b7c4 no jira: typo is fixed
    omit 377d78681 [OPENMEETINGS-2770] maven-surefire
    omit 3db34bf3b Switching to the next dev version
    omit 726e9d321 7.1.0 Release Candidate 1
    omit 33cee768e [OPENMEETINGS-2758] some Sonar issues are addressed
    omit 4313f519b [OPENMEETINGS-2758] build should be fixed
    omit 120c49ba9 [OPENMEETINGS-2758] some Sonar issues are addressed
    omit 328c9b42d [OPENMEETINGS-2757] checkstyle
    omit ef91f39a3 [OPENMEETINGS-2758] some Sonar code smells are addressed
    omit 900a3ed84 [OPENMEETINGS-2759] translations were imported
    omit 822319e9d [OPENMEETINGS-2757] junit
    omit 287146a6e [OPENMEETINGS-2769] 'ask permission' dialog should be fixed
    omit 0915969d2 [OPENMEETINGS-2768] Save button is always visible for new 
events
    omit ac38cb5cc [OPENMEETINGS-2757] JS libraries are updated
    omit dd245c51f [OPENMEETINGS-2767] code clean-up
    omit fe74b9773 [OPENMEETINGS-2767] WebRTCPeer was updated with latest 
changes from OpenVidu; instructions to enable service were added
    omit 02532c5cb [OPENMEETINGS-2757] maven-checkstyle, asterisk-java, mysql, 
logback; code clean-up
    omit fbc405b8e [OPENMEETINGS-2757] wicket-bootstrap, code clean-up
    omit 96fd223d8 [OPENMEETINGS-2757] wicket, wicketstuff, the way tomcat is 
downloaded
    omit e9409e37b [OPENMEETINGS-2757] maven-info-reports, tomcat
    omit d702d15ae [OPENMEETINGS-2757] spring
    omit 45f10819c no jira: turning OFF dependabot PRs
    omit 3321de5af no jira: compiler option to display deprecations
    omit ecf5d1ef4 [OPENMEETINGS-2757] maven-site-plugin downgraded
     new 3edc9200d [OPENMEETINGS-2756] spring, cxf, tomcat, wicket
     new e3edd39ed Project is compilable, tests are RED
     new 7dd9fa045 javax.annotation -> jakarta.annotation
     new 5e0f74190 [OPENMEETINGS-2756] build is green for me; trublemakers so 
far: wicket-ioc, prometheus, jackrabbit-webdav
     new 14022bfb1 [OPENMEETINGS-2756] prometheus is back, code clean-up
     new dd34b9107 [OPENMEETINGS-2756] jackrabbit-webdav maven coordinates are 
updated, bcprov is updated

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   (f9ae89f4b)
            \
             N -- N -- N   refs/heads/jakarta-spring-6 (dd34b9107)

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:
 .asf.yaml                                          |  17 ---
 CHANGELOG.md                                       |  33 +-----
 README.md                                          |  23 +---
 openmeetings-core/pom.xml                          |   2 +-
 .../openmeetings/core/converter/BaseConverter.java |  13 ++-
 .../core/converter/ImageConverter.java             |   3 +-
 .../openmeetings/core/data/file/FileProcessor.java |   3 +-
 openmeetings-db/pom.xml                            |   2 +-
 .../apache/openmeetings/db/dao/label/LabelDao.java |   5 +-
 .../apache/openmeetings/db/dao/user/UserDao.java   |  35 +++---
 .../apache/openmeetings/db/dto/basic/Health.java   |  11 +-
 .../apache/openmeetings/db/entity/user/User.java   |  74 +++----------
 openmeetings-install/pom.xml                       |   2 +-
 .../java/org/apache/openmeetings/cli/Admin.java    |   1 +
 openmeetings-mediaserver/pom.xml                   |   2 +-
 openmeetings-screenshare/pom.xml                   |   2 +-
 openmeetings-server/pom.xml                        |  55 ++++++----
 .../src/main/assembly/scripts/openmeetings.service |   1 -
 openmeetings-server/src/site/xdoc/NewsArchive.xml  |  34 ------
 openmeetings-server/src/site/xdoc/downloads.xml    |  30 +++---
 openmeetings-server/src/site/xdoc/index.xml        |  33 +++---
 openmeetings-server/src/site/xdoc/security.xml     |  81 +++++---------
 openmeetings-service/pom.xml                       |   2 +-
 .../mail/template/AbstractTemplatePage.html        | 118 ---------------------
 .../mail/template/AbstractTemplatePanel.html       |   3 +-
 ...emplatePage.java => AbstractTemplatePanel.java} |  32 ++----
 .../service/mail/template/FeedbackTemplate.html    |  22 ++--
 .../service/mail/template/FeedbackTemplate.java    |   5 +-
 .../service/mail/template/InvitationTemplate.html  |  29 ++---
 .../service/mail/template/InvitationTemplate.java  |   5 +-
 .../mail/template/RegisterUserTemplate.html        |  28 ++---
 .../mail/template/RegisterUserTemplate.java        |   5 +-
 .../template/RequestContactConfirmTemplate.html    |  12 +--
 .../template/RequestContactConfirmTemplate.java    |   5 +-
 .../mail/template/RequestContactTemplate.html      |  20 ++--
 .../mail/template/RequestContactTemplate.java      |   5 +-
 .../mail/template/ResetPasswordTemplate.html       |  26 +----
 .../mail/template/ResetPasswordTemplate.java       |   5 +-
 .../template/subject/SubjectEmailTemplate.java     |   6 +-
 .../openmeetings/service/scheduler/CleanupJob.java |  16 +--
 .../service/scheduler/ReminderJob.java             |   2 +-
 openmeetings-util/pom.xml                          |   2 +-
 openmeetings-web/pom.xml                           |   2 +-
 openmeetings-web/src/main/front/main/package.json  |   2 +-
 openmeetings-web/src/main/front/main/src/index.js  |   2 +-
 .../src/main/front/settings/package.json           |   2 +-
 .../src/main/front/settings/src/WebRtcPeer.js      |  21 ++--
 .../src/main/front/settings/src/video-util.js      |  38 +++----
 openmeetings-web/src/main/front/wb/package.json    |   4 +-
 .../openmeetings/web/admin/groups/GroupForm.java   |   5 +-
 .../openmeetings/web/admin/labels/LangPanel.java   |   2 +-
 .../apache/openmeetings/web/app/Application.java   |   2 +-
 .../web/app/Application_de.properties.xml          |   2 +-
 .../web/common/UploadableImagePanel.java           |  35 +++---
 .../web/common/UploadableProfileImagePanel.java    |   5 +-
 .../openmeetings/web/common/upload/UploadForm.java |   2 +-
 .../apache/openmeetings/web/pages/BasePage.html    |  54 +++++-----
 .../apache/openmeetings/web/pages/BasePage.java    |   3 -
 .../apache/openmeetings/web/room/raw-nettest.js    |  34 +++---
 .../web/user/calendar/AppointmentDialog.java       |   8 +-
 .../util/upload/BootstrapFileUploadBehavior.java   |   9 +-
 .../apache/openmeetings/userdata/TestLogin.java    |  27 -----
 .../openmeetings/webservice/TestFileService.java   |   5 +-
 openmeetings-webservice/pom.xml                    |   2 +-
 .../openmeetings/webservice/InfoWebService.java    |   2 +-
 pom.xml                                            |  72 ++++++++-----
 66 files changed, 362 insertions(+), 788 deletions(-)
 delete mode 100644 .asf.yaml
 delete mode 100644 
openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
 copy 
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
 => 
openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
 (96%)
 rename 
openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/{AbstractTemplatePage.java
 => AbstractTemplatePanel.java} (57%)

Reply via email to