You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2023/05/23 06:52:57 UTC
[openmeetings] branch master updated (5d9e8fb5f -> f2497f3a1)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
from 5d9e8fb5f [OPENMEETINGS-2770] maven-assembly-plugin, tika
add 15d6e2947 [OPENMEETINGS-2774] initial commit to fix styles in the emails
new f2497f3a1 [OPENMEETINGS-2770] commons-io, swagger, plugins
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:
.../mail/template/AbstractTemplatePage.html | 109 +++++++++++++++++++++
...emplatePanel.java => AbstractTemplatePage.java} | 31 ++++--
.../mail/template/AbstractTemplatePanel.html | 27 -----
.../service/mail/template/FeedbackTemplate.java | 5 +-
.../service/mail/template/InvitationTemplate.java | 5 +-
.../mail/template/RegisterUserTemplate.java | 5 +-
.../template/RequestContactConfirmTemplate.java | 5 +-
.../mail/template/RequestContactTemplate.java | 5 +-
.../mail/template/ResetPasswordTemplate.java | 5 +-
.../template/subject/SubjectEmailTemplate.java | 6 +-
.../apache/openmeetings/web/app/Application.java | 2 +-
.../apache/openmeetings/web/pages/BasePage.html | 54 +++++-----
.../apache/openmeetings/web/pages/BasePage.java | 3 +
pom.xml | 10 +-
14 files changed, 185 insertions(+), 87 deletions(-)
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
[openmeetings] 01/01: [OPENMEETINGS-2770] commons-io, swagger, plugins
Posted by so...@apache.org.
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
commit f2497f3a18c602308a57eddcb88832e6827e137c
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue May 23 13:49:43 2023 +0700
[OPENMEETINGS-2770] commons-io, swagger, plugins
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4271ebdbb..c3005e0ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
<maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version>
- <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+ <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<license-maven-plugin.version>2.0.0</license-maven-plugin.version>
@@ -57,7 +57,7 @@
<maven-project-info-reports-plugin.version>3.4.3</maven-project-info-reports-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
- <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
+ <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
@@ -73,7 +73,7 @@
<sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
<jacoco-maven-plugin.versoin>0.8.10</jacoco-maven-plugin.versoin>
<forbiddenapis.version>3.5.1</forbiddenapis.version>
- <maven-checkstyle-plugin.version>3.2.2</maven-checkstyle-plugin.version>
+ <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
<frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
<swagger-plugin.version>2.1.6</swagger-plugin.version>
<plexus-utils.version>3.5.1</plexus-utils.version>
@@ -103,7 +103,7 @@
<commons-pool2.version>2.11.1</commons-pool2.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-codec.version>1.15</commons-codec.version>
- <commons-io.version>2.11.0</commons-io.version>
+ <commons-io.version>2.12.0</commons-io.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-text.version>1.10.0</commons-text.version>
<commons-net.version>3.9.0</commons-net.version>
@@ -131,7 +131,7 @@
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
<apacheds-test-framework.version>2.0.0.AM26</apacheds-test-framework.version>
- <swagger.version>2.2.9</swagger.version>
+ <swagger.version>2.2.10</swagger.version>
<bytebuddy.version>1.14.4</bytebuddy.version>
<annotation-api.version>1.3.2</annotation-api.version>
<jsr305.version>3.0.2</jsr305.version>