Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions operator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -317,4 +317,5 @@
</properties>
</profile>
</profiles>
<pluginRepositories> <pluginRepository> <id>sonatype-snapshots</id> <name>Sonatype Snapshots</name> <url>https://central.sonatype.com/repository/maven-snapshots/</url> <snapshots> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> </snapshots> <releases> <enabled>false</enabled> </releases> </pluginRepository> </pluginRepositories>
</project>
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

<asciidoctor.plugin.version>1.5.8</asciidoctor.plugin.version>

<quarkus.version>3.24.5</quarkus.version>
<quarkus.build.version>3.24.5</quarkus.build.version>
<quarkus.version>999-SNAPSHOT</quarkus.version>
<quarkus.build.version>999-SNAPSHOT</quarkus.build.version>
<jboss-logging-annotations.version>3.0.4.Final</jboss-logging-annotations.version> <!-- keep in sync with the version used by quarkus -->

<project.build-time>${timestamp}</project.build-time>
Expand Down Expand Up @@ -106,7 +106,7 @@
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<log4j.version>1.2.17</log4j.version>
<log4j2-api.version>2.24.3</log4j2-api.version> <!-- Odd name needs to align with Quarkus -->
<log4j2-api.version>2.25.1</log4j2-api.version> <!-- Odd name needs to align with Quarkus -->
<resteasy.version>6.2.12.Final</resteasy.version>
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
<owasp.html.sanitizer.version>20240325.1</owasp.html.sanitizer.version>
Expand Down Expand Up @@ -145,7 +145,7 @@
<com.apicatalog.titanium-json-ld.version>1.3.3</com.apicatalog.titanium-json-ld.version>
<io.setl.rdf-urdna.version>1.1</io.setl.rdf-urdna.version>

<liquibase.version>4.29.1</liquibase.version>
<liquibase.version>4.33.0</liquibase.version>
<servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
<servlet.api.40.version>2.0.0.Final</servlet.api.40.version>
<twitter4j.version>4.1.2</twitter4j.version>
Expand Down Expand Up @@ -1718,4 +1718,5 @@
</properties>
</profile>
</profiles>
<repositories> <repository> <id>sonatype-snapshots</id> <name>Sonatype Snapshots</name> <url>https://central.sonatype.com/repository/maven-snapshots/</url> <snapshots> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> </snapshots> <releases> <enabled>false</enabled> </releases> </repository> </repositories>
</project>
1 change: 1 addition & 0 deletions quarkus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@
</repository>
</repositories>

<pluginRepositories> <pluginRepository> <id>sonatype-snapshots</id> <name>Sonatype Snapshots</name> <url>https://central.sonatype.com/repository/maven-snapshots/</url> <snapshots> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> </snapshots> <releases> <enabled>false</enabled> </releases> </pluginRepository> </pluginRepositories>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import io.quarkus.logging.Log;
import io.quarkus.test.junit.main.Launch;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
Expand All @@ -36,7 +35,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.countMatches;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.is;
Expand Down Expand Up @@ -92,11 +90,9 @@ public void assertManualDbInitialization(CLIResult cliResult, RawDistRootPath ra
var output = readKeycloakDbUpdateScript(rawDistRootPath);

assertThat(output, notNullValue());
assertThat(output, containsString("Create Database Change Log Table"));

var outputLowerCase = output.toLowerCase();
var count = countMatches(outputLowerCase, "create table public.databasechangelog") + countMatches(outputLowerCase, "create table keycloak.databasechangelog");
assertThat(count, is(1));
assertThat(output, containsString("Keycloak database creation script - apply this script to empty DB"));
assertThat(output, containsString("Change Log: META-INF/jpa-changelog-master.xml"));
assertThat(output, containsString("Changeset META-INF/jpa-changelog-26.2.6.xml"));
}

protected static String readKeycloakDbUpdateScript(RawDistRootPath path) {
Expand Down