Skip to content
Merged
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
6 changes: 1 addition & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true
Expand Down Expand Up @@ -57,10 +57,6 @@ ij_html_do_not_indent_children_of_tags = html
indent_size = 4
ij_continuation_indent_size = 4

# Go language uses tabs by default
[*.go]
indent_style = tab

# IntelliJ Kotlin specific rules
[*.{kt,kts}]
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@
*.jpeg binary
*.jar binary
*.p12 binary
*.ttf binary
5 changes: 3 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Nightly Build
on:
schedule:
- cron: "59 23 1 1 *"
- cron: "59 23 1 1 1"
# TODO Now running less than yearly. Restore to daily with commented line below
# - cron: "59 23 * * *"

permissions: read-all
Expand Down Expand Up @@ -39,7 +40,7 @@ jobs:
source "$HOME/.sdkman/bin/sdkman-init.sh"
sdk env install

./mvnw -P buildpack -P gatling
./mvnw -P gatling
- name: Build Client
run: |
export CLIENT_PATH='target/generated-sources/openapi'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
- name: Java Setup
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: temurin
java-version: '25'
distribution: liberica
- name: Publish and Tag Application
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 8 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

<extensions>
<extension>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
<version>1.2.0</version>
</extension>
</extensions>
1 change: 1 addition & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-T1.5C
--update-snapshots
--fail-at-end
-D=mavenCentral
72 changes: 72 additions & 0 deletions .mvn/settings-example.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@

<!--
! To use it on this repository, rename it to 'settings.xml'
!-->
<settings
xmlns="http://maven.apache.org/SETTINGS/1.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd">

<servers>
<server>
<id>central</id>
<username>user</username>
<password>pass</password>
</server>

<server>
<id>snapshots</id>
<username>user</username>
<password>pass</password>
</server>
</servers>

<profiles>

<!--
! Picks internal repositories if 'mavenCentral' is not defined. For corporate integration
!-->
<profile>
<id>artifactory</id>

<activation>
<property>
<name>!mavenCentral</name>
</property>
</activation>

<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>api-maven-release-virtual</name>
<url>https://artifactory.com/artifactory/api-maven-release-virtual</url>
</repository>
<repository>
<id>snapshots</id>
<name>api-maven-snapshot-virtual</name>
<url>https://artifactory.com/artifactory/api-maven-snapshot-virtual</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>plugins-release</name>
<url>https://artifactory.com/artifactory/plugins-release</url>
</pluginRepository>
<pluginRepository>
<id>snapshots</id>
<name>plugins-release</name>
<url>https://artifactory.com/artifactory/plugins-release</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>
71 changes: 42 additions & 29 deletions .mvn/spring.xml → .mvn/spring-boot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.5</version>
<version>4.0.0</version>
<relativePath/>
</parent>

<groupId>com.github.jaguililla</groupId>
<artifactId>spring</artifactId>
<version>0.1.0</version>
<artifactId>spring-boot</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>

<name>Spring base POM</name>
Expand All @@ -34,43 +34,51 @@
</description>

<properties>
<maven>3.9.9</maven>
<maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
<maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
<maven-jlink-plugin.version>3.2.0</maven-jlink-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
<doxia-module-markdown.version>2.0.0</doxia-module-markdown.version>

<openApiNullable>false</openApiNullable>
<openapi.package>${project.groupId}.${project.artifactId}.http</openapi.package>
<controllers.package>${openapi.package}.controllers</controllers.package>
<client.package>${openapi.package}.client</client.package>
<image.name>${project.groupId}/${project.artifactId}</image.name>
<image.registry>docker.io</image.registry>
<spring.server>undertow</spring.server> <!-- undertow | jetty | tomcat -->
<spring.server>jetty</spring.server> <!-- jetty | tomcat -->
<openapi.integration>ui</openapi.integration> <!-- ui | api -->

<java.version>21</java.version>
<springdoc.openapi.version>2.8.4</springdoc.openapi.version>
<openapi.generator.version>7.11.0</openapi.generator.version>
<java.version>25</java.version>
<springdoc.openapi.version>2.8.6</springdoc.openapi.version> <!-- TODO 2.8.14 version fails -->
<openapi.generator.version>7.16.0</openapi.generator.version>

<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
<pitest-maven.version>1.17.3</pitest-maven.version>
<pitest-junit5-plugin.version>1.2.1</pitest-junit5-plugin.version>
<pitest-maven.version>1.20.0</pitest-maven.version>
<pitest-junit5-plugin.version>1.2.3</pitest-junit5-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.6.1</exec-maven-plugin.version>

<jacoco.version>0.8.13</jacoco.version>
<jacoco.version>0.8.14</jacoco.version>
<archunit.version>1.4.1</archunit.version>
<gatling.version>3.13.4</gatling.version>
<gatling.maven.version>4.14.0</gatling.maven.version>
<gatling.version>3.14.3</gatling.version>
<gatling.maven.version>4.19.0</gatling.maven.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -110,12 +118,12 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<artifactId>testcontainers-postgresql</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId>
<artifactId>testcontainers-kafka</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -130,18 +138,20 @@
<version>${gatling.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-restclient</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<defaultGoal>verify</defaultGoal>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>--enable-preview</compilerArgs>
</configuration>
<version>${maven-compiler-plugin.version}</version>
</plugin>

<plugin>
Expand All @@ -150,8 +160,13 @@
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -316,7 +331,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
<configuration>
Expand All @@ -338,7 +352,6 @@
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
<reportSets>
Expand Down
20 changes: 2 additions & 18 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-5/apache-maven-4.0.0-rc-5-bin.zip
5 changes: 4 additions & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=21.0.7-librca

mvnd=2.0.0-rc-3

java=25.0.1.fx-librca
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM docker.io/bellsoft/liberica-runtime-container:jre-21-slim-musl
FROM docker.io/bellsoft/liberica-runtime-container:jre-25-cds-slim-musl

ARG PROJECT="appointments"
ARG OTEL_BASE="github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download"
Expand All @@ -14,8 +14,7 @@ USER 1000

ENV OTEL_SERVICE_NAME "$PROJECT"
ENV PERFORMANCE_OPTIONS "-XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA"
ENV TELEMETRY_OPTIONS "-javaagent:./opentelemetry.jar"
ENV JAVA_TOOL_OPTIONS "$PERFORMANCE_OPTIONS $TELEMETRY_OPTIONS"
ENV JAVA_TOOL_OPTIONS "$PERFORMANCE_OPTIONS"

HEALTHCHECK --interval=10s --start-period=10s CMD \
wget -O/dev/stdout --tries=1 \
Expand Down
Loading