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

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   |  34 ++--
 .../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/main/assembly/src.xml      |   3 +
 .../src/site/xdoc/BuildInstructions.xml            |   6 +-
 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 ++++++++++++++
 ...emplatePanel.java => AbstractTemplatePage.java} |  31 +++-
 .../mail/template/AbstractTemplatePanel.html       |  27 ----
 .../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 +-
 .../src/main/webapp/WEB-INF/classes/hazelcast.xml  |   2 +-
 .../apache/openmeetings/userdata/TestLogin.java    |  27 ++++
 .../openmeetings/webservice/TestFileService.java   |   5 +-
 openmeetings-webservice/pom.xml                    |   2 +-
 .../openmeetings/webservice/InfoWebService.java    |   2 +-
 pom.xml                                            | 177 ++++++---------------
 69 files changed, 815 insertions(+), 473 deletions(-)
 create mode 100644 .asf.yaml
 create mode 100644 
openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
 rename 
openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/{AbstractTemplatePanel.java
 => AbstractTemplatePage.java} (58%)
 delete mode 100644 
openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html

Reply via email to