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 2022/04/20 16:01:32 UTC
[openmeetings] branch master updated (36d6447ee -> 557ab1777)
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 36d6447ee [OPENMEETINGS-2724] URL for google fonts is corrected
new 9afc4085e [OPENMEETINGS-2675] mockito, postgres
new 557ab1777 [OPENMEETINGS-2724] default CSP style is improved
The 2 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:
.../java/org/apache/openmeetings/installation/ImportInitvalues.java | 1 +
.../main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java | 2 +-
pom.xml | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
[openmeetings] 01/02: [OPENMEETINGS-2675] mockito, postgres
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 9afc4085ea1a30c395c330f1942fddbb2a0f9f3c
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 20 23:00:26 2022 +0700
[OPENMEETINGS-2675] mockito, postgres
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9be5b7b5b..dc6be9b60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
<dom4j.version>2.1.3</dom4j.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-io.version>2.11.0</commons-io.version>
- <postgresql.version>42.3.3</postgresql.version>
+ <postgresql.version>42.3.4</postgresql.version>
<mysql.version>8.0.28</mysql.version>
<mssql.version>10.2.0.jre11</mssql.version>
<ojdbc.version>19.14.0.0</ojdbc.version>
@@ -121,7 +121,7 @@
<jetty.version>9.4.46.v20220331</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
- <mockito.version>4.4.0</mockito.version>
+ <mockito.version>4.5.0</mockito.version>
<quartz.version>2.3.2</quartz.version>
<kurento.version>6.16.5</kurento.version>
<jain-sip.version>1.2.307</jain-sip.version><!-- other versions are broken! -->
[openmeetings] 02/02: [OPENMEETINGS-2724] default CSP style is improved
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 557ab17777af96973cccb1ea85feddc49e280d4c
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 20 23:01:21 2022 +0700
[OPENMEETINGS-2724] default CSP style is improved
---
.../java/org/apache/openmeetings/installation/ImportInitvalues.java | 1 +
.../main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index 2a045bab0..4dea4de8c 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -403,6 +403,7 @@ public class ImportInitvalues {
+ "United, Yeti", "6.1.0");
return list;
}
+
public void loadConfiguration(InstallationConfig cfg) {
for (Configuration c : initialCfgs(cfg)) {
cfgDao.update(c, null);
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
index 69341f313..6f83e62c6 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
@@ -130,7 +130,7 @@ public class OpenmeetingsVariables {
public static final String DEFAULT_BASE_URL = "https://localhost:5443/openmeetings/";
public static final String DEFAULT_SIP_CONTEXT = "rooms";
public static final String DEFAULT_CSP_FONT = "https://fonts.gstatic.com";
- public static final String DEFAULT_CSP_STYLE = "https://fonts.googleapis.com/css2";
+ public static final String DEFAULT_CSP_STYLE = SELF.getValue() + ",https://fonts.googleapis.com/css2";
public static final String DEFAULT_CSP_DATA = SELF.getValue() + ",data:";
private static String cryptClassName = null;