Skip to content

Migrate RM server to Quarkus framework #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
google-labs-jules wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Migrate RM server to Quarkus framework #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf7d8c7
Migrate RefImpl RM server to Quarkus
google-labs-jules[bot] Dec 20, 2025
2e76319
fix: Quarkus running
berezovskyi Dec 20, 2025
ecf976b
Migrate RefImpl RM server to Quarkus
google-labs-jules[bot] Dec 20, 2025
f261f5f
fix: swagger
berezovskyi Dec 20, 2025
132c2f7
Revert "Migrate RefImpl RM server to Quarkus"
berezovskyi Dec 20, 2025
1a8fd75
feat: inject versions
berezovskyi Dec 20, 2025
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
2 changes: 1 addition & 1 deletion src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import kotlin.collections.HashSet
import kotlin.system.measureNanoTime


private val SPC_RM_DEFAULT = "http://localhost:8800/services/catalog/singleton"
private val SPC_RM_DEFAULT = "http://localhost:8800/catalog/singleton"
private val SPC_CM_DEFAULT = "http://localhost:8801/services/catalog/singleton"
private val SPC_AM_DEFAULT = "http://localhost:8803/services/catalog/singleton"
private val SPC_QM_DEFAULT = "http://localhost:8802/services/catalog/singleton"
Expand Down
2 changes: 1 addition & 1 deletion src/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
context: ./
dockerfile: server-rm/Dockerfile
ports:
- "127.0.0.1:8800:8080"
- "127.0.0.1:8800:8800"
server-cm:
build:
context: ./
Expand Down
2 changes: 1 addition & 1 deletion src/refimpl-tests/src/test/java/co/oslc/refimpl/tests/OslcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class OslcTest {
@Container
public static ComposeContainer environment = new ComposeContainer(new File("src/test/resources/docker-compose.yml"))
.withExposedService(RM_SVC, RM_PORT,
Wait.forLogMessage(".*main: Started oejs.Server@.*", 1)
Wait.forLogMessage(".*(Started oejs.Server@|Quarkus.*started in).*", 1)
.withStartupTimeout(Duration.ofSeconds(STARTUP_TIMEOUT)))
.withExposedService(CM_SVC, CM_PORT,
Wait.forLogMessage(".*main: Started oejs.Server@.*", 1)
Expand Down
7 changes: 5 additions & 2 deletions src/refimpl-tests/src/test/java/co/oslc/refimpl/tests/SwaggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class SwaggerTest {
@Container
public static ComposeContainer environment = new ComposeContainer(new File("src/test/resources/docker-compose.yml"))
.withExposedService(RM_SVC, RM_PORT,
Wait.forLogMessage(".*main: Started oejs.Server@.*", 1)
Wait.forLogMessage(".*(Started oejs.Server@|Quarkus.*started in).*", 1)
.withStartupTimeout(Duration.ofSeconds(STARTUP_TIMEOUT)))
.withExposedService(CM_SVC, CM_PORT,
Wait.forLogMessage(".*main: Started oejs.Server@.*", 1)
Expand Down Expand Up @@ -119,7 +119,10 @@ void waitForService(String url) {
void swaggerUiShouldBeAccessible(String svc) {
var serviceHost = "localhost";
var servicePort = fixedPorts.get(svc);
var swaggerUrl = "http://%s:%d/swagger-ui/index.jsp".formatted(serviceHost, servicePort);
// Use /q/swagger-ui for Quarkus RM server, /swagger-ui/index.jsp for legacy Jetty servers
var swaggerUrl = RM_SVC.equals(svc)
? "http://%s:%d/q/swagger-ui".formatted(serviceHost, servicePort)
: "http://%s:%d/swagger-ui/index.jsp".formatted(serviceHost, servicePort);
var expectedYamlUrl = "http://%s:%d/services/openapi.yaml".formatted(serviceHost, servicePort);
var rootServicesUrl = "http://%s:%d/services/rootservices".formatted(serviceHost, servicePort);

Expand Down
19 changes: 11 additions & 8 deletions src/server-rm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ COPY client-toolchain/pom.xml client-toolchain/pom.xml
COPY lib-common/ lib-common/
COPY server-rm/ server-rm/

# Build only the specific module and its dependencies
RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-rm -am
# Build Quarkus uber-jar (single JAR with all dependencies)
RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-rm -am -Dquarkus.package.jar.type=uber-jar

FROM docker.io/library/jetty:12-jre21-eclipse-temurin
FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:1.20

# Add metadata
LABEL org.opencontainers.image.title="OSLC RefImpl RM Server"
Expand All @@ -27,11 +27,14 @@ LABEL org.opencontainers.image.source="https://github.com/oslc-op/refimpl"
LABEL org.opencontainers.image.vendor="OSLC Open Project"
LABEL org.opencontainers.image.licenses="EPL-2.0"

# WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
# $JETTY_BASE must be correct before starting Jetty
ENV LANGUAGE='en_US:en'

COPY --from=build /src/server-rm/target/*.war /var/lib/jetty/webapps/ROOT.war
WORKDIR /deployments

RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl
# Copy the Quarkus uber-jar
COPY --from=build --chown=185 /src/server-rm/target/*-runner.jar /deployments/quarkus-run.jar

EXPOSE 8080
EXPOSE 8800
USER 185

ENTRYPOINT ["java", "-jar", "/deployments/quarkus-run.jar"]
Loading
Loading