Merge remote-tracking branch 'upstream/master'

This commit is contained in:
mcasari 2023-08-19 23:43:01 +02:00
commit c6e1f95e42
2 changed files with 2 additions and 5 deletions

View File

@ -28,9 +28,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.jupiter.api.Disabled;
@Disabled //fixing in https://team.baeldung.com/browse/JAVA-23897
public class CertificatesUnitTest { public class CertificatesUnitTest {
private static final String GODADDY_CA_ALIAS = "godaddyrootg2ca [jdk]"; private static final String GODADDY_CA_ALIAS = "godaddyrootg2ca [jdk]";

View File

@ -789,7 +789,7 @@
<module>kubernetes-modules</module> <module>kubernetes-modules</module>
<module>libraries-concurrency</module> <module>libraries-concurrency</module>
<module>jhipster-6</module> <module>jhipster-6</module>
<!--<module>libraries-testing</module>--> <!-- Fixing in JAVA-24012 --> <module>libraries-testing</module>
<module>maven-modules</module> <module>maven-modules</module>
<module>optaplanner</module> <module>optaplanner</module>
<module>persistence-modules</module> <module>persistence-modules</module>
@ -1060,7 +1060,7 @@
<module>kubernetes-modules</module> <module>kubernetes-modules</module>
<module>libraries-concurrency</module> <module>libraries-concurrency</module>
<module>jhipster-6</module> <module>jhipster-6</module>
<!--<module>libraries-testing</module>--> <!-- Fixing in JAVA-24012 --> <module>libraries-testing</module>
<module>maven-modules</module> <module>maven-modules</module>
<module>optaplanner</module> <module>optaplanner</module>
<module>persistence-modules</module> <module>persistence-modules</module>