diff --git a/README.md b/README.md
index 3bfe017f406593f8ae473bf6364122f3c97a49f6..ba6fd5162432b30a74b3283fdd1ee18764ae08eb 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,9 @@ With regard to licensing and copyright please refer to the file [LICENSE](LICENS
* [Installation](https://www.openolat.com/fileadmin/adminwiki/_START_.html)
* [About OpenOLAT](https://www.openolat.com)
* [Mailing list](https://groups.google.com/forum/#!forum/openolat)
-
+* [Issues](https://jira.openolat.org/)
+* [OpenOLAT for the community](https://community.openolat.org) An OpenOLAT instance dedicated to the community
+
## Being a community member
@@ -37,7 +39,7 @@ We strongly suggest to participate in the OpenOLAT community membership program.
Even though this software is free and open source, the development and management
has to be funded by someone. If you like what we do and want the product to be
maintained and developed in the long run you should consider purchasing a member
-ship.
+ship: [Partner program](https://www.openolat.com/open-source/partner-program/?lang=en).
## Developers
diff --git a/pom.xml b/pom.xml
index 8db0ad774da8ec0a62b04b77f148ec9c1e0820ba..f6d5fd571f41579d66cff39bb2c0caa38ed662d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1304,7 +1304,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
+ <version>2.21.0</version>
<configuration>
<encoding>UTF-8</encoding>
<skipTests>${skipTests}</skipTests>
@@ -1383,7 +1383,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.1</version>
<configuration>
<!--
<attachClasses>true</attachClasses>
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/MemoryRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/MemoryRenderer.java
index 4594a5ad2e80a47c773e9421bf4299565d292357..322176a2e17c1f083e5b97ed45592e6f6c7c4016 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/MemoryRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/MemoryRenderer.java
@@ -42,7 +42,7 @@ import org.olat.core.gui.translator.Translator;
*/
public class MemoryRenderer extends DefaultComponentRenderer {
- private static final String[] bars = new String[]{ "progress-bar-success", "progress-bar-warning", "progress-bar-info"};
+ private static final String[] bars = new String[]{ "progress-bar-success", "progress-bar-warning", "progress-bar-info" };
@Override
public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu,
@@ -98,14 +98,11 @@ public class MemoryRenderer extends DefaultComponentRenderer {
usedPercent = usedPercent - (totalUsedPercent - 100l);
}
- sb.append("<div class='progress-bar ").append(bars[count++]).append("' role='progressbar' ")
+ sb.append("<div class='progress-bar ").append(bars[count++ % bars.length]).append("' role='progressbar' ")
.append(" aria-valuenow='").append(usedMB).append("'")
.append(" aria-valuemin='0' style='width:").append(usedPercent).append("%;'><span")
.append(" title=\"").append(usedMB).append("MB (").append(name).append(")\"")
.append(">").append(usedMB).append("MB (").append(name).append(")</span></div>");
- if(count > bars.length) {
- count = 0;
- }
}
}
diff --git a/src/main/java/org/olat/core/util/xml/XMLDigitalSignatureUtil.java b/src/main/java/org/olat/core/util/xml/XMLDigitalSignatureUtil.java
index da3b0b7e77ff6128d0abdcfab328776f636bb15a..4d28f810cc612abef4ebd823d8046586de8240fa 100644
--- a/src/main/java/org/olat/core/util/xml/XMLDigitalSignatureUtil.java
+++ b/src/main/java/org/olat/core/util/xml/XMLDigitalSignatureUtil.java
@@ -336,7 +336,7 @@ public class XMLDigitalSignatureUtil {
KeyInfoFactory kif = sigFactory.getKeyInfoFactory();
X509Data xd = kif.newX509Data(Collections.singletonList(x509Cert));
- List<Object> keyInfoList = new ArrayList<>();
+ List<XMLStructure> keyInfoList = new ArrayList<>();
if(StringHelper.containsNonWhitespace(keyName)) {
keyInfoList.add(kif.newKeyName(keyName));
}
@@ -461,18 +461,18 @@ public class XMLDigitalSignatureUtil {
private static class X509KeySelector extends KeySelector {
+ @Override
public KeySelectorResult select(KeyInfo keyInfo, KeySelector.Purpose purpose, AlgorithmMethod method, XMLCryptoContext context)
throws KeySelectorException {
- @SuppressWarnings("unchecked")
- Iterator<Object> ki = keyInfo.getContent().iterator();
+
+ Iterator<?> ki = keyInfo.getContent().iterator();
while (ki.hasNext()) {
XMLStructure info = (XMLStructure) ki.next();
if (!(info instanceof X509Data)) {
continue;
}
X509Data x509Data = (X509Data) info;
- @SuppressWarnings("unchecked")
- Iterator<Object> xi = x509Data.getContent().iterator();
+ Iterator<?> xi = x509Data.getContent().iterator();
while (xi.hasNext()) {
Object o = xi.next();
if (!(o instanceof X509Certificate)) {
diff --git a/src/test/profile/mysql/olat.local.properties b/src/test/profile/mysql/olat.local.properties
index 34e0cd44e1fce70efe8868eea40899bb10e36449..abc651e5a5f10dfa00b43b275d61ad48e8352f3b 100644
--- a/src/test/profile/mysql/olat.local.properties
+++ b/src/test/profile/mysql/olat.local.properties
@@ -44,8 +44,8 @@ db.name=${test.env.db.name:olattest}
db.user=${test.env.db.user:olat}
db.pass=${test.env.db.pass:olat}
db.host.port=${test.env.db.host.port:3306}
-db.database.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
auto.upgrade.database=false
+db.hibernate.hikari.leakDetectionThreshold=120000
#site we need
site.portal.enable=true
diff --git a/src/test/profile/oracle/olat.local.properties b/src/test/profile/oracle/olat.local.properties
index 84074f207532f031c6d94b22cc79ed59b6a541eb..8a8b85b864537488f0f5fa325b057263e2999ba6 100644
--- a/src/test/profile/oracle/olat.local.properties
+++ b/src/test/profile/oracle/olat.local.properties
@@ -45,8 +45,8 @@ db.pass=oracle
db.host=192.168.1.202
db.host.port=1521
db.default.schema=olattest
-db.database.dialect=org.hibernate.dialect.Oracle10gDialect
auto.upgrade.database=false
+db.hibernate.hikari.leakDetectionThreshold=120000
#make sure it works it mimic the pre 8.3 behavior
group.mandatory.enrolment.email.users=false
diff --git a/src/test/profile/postgresql/olat.local.properties b/src/test/profile/postgresql/olat.local.properties
index 8c7763a890d54c7b721e7c3adfb659e5531ca843..1ad81c1e6b914c2d830fb33968fdc724bdcb14c4 100644
--- a/src/test/profile/postgresql/olat.local.properties
+++ b/src/test/profile/postgresql/olat.local.properties
@@ -44,7 +44,6 @@ db.name=${test.env.db.name:olattest}
db.user=${test.env.db.postgresql.user:postgres}
db.pass=${test.env.db.postgresql.pass:postgres}
db.host.port=${test.env.db.postgresql.host.port:5432}
-db.database.dialect=org.hibernate.dialect.PostgreSQLDialect
auto.upgrade.database=false
db.hibernate.hikari.leakDetectionThreshold=120000