Skip to content

Commit

Permalink
chore(pom): montée de version des libs
Browse files Browse the repository at this point in the history
- ajout dependency management pour éviter des failles de sécu
  • Loading branch information
michaelcoll committed Jun 11, 2024
1 parent 56f56ce commit d026e3c
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 26 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@commitlint/config-conventional": "19.2.2",
"husky": "9.0.11"
},
"packageManager": "pnpm@9.1.0",
"packageManager": "pnpm@9.3.0",
"engines": {
"node": ">=20"
}
Expand Down
90 changes: 65 additions & 25 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,18 @@
<!-- Dependency versions -->
<ms-common.version>1.1.0</ms-common.version>

<commons-compress.version>1.26.2</commons-compress.version>
<guava.version>33.2.1-jre</guava.version>
<h2.version>2.2.224</h2.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<mockserver-spring-test-listener.version>5.15.0</mockserver-spring-test-listener.version>
<snakeyaml.version>2.2</snakeyaml.version>
<spring.version>3.3.0</spring.version>
<spring-cloud-dependencies.version>2023.0.2</spring-cloud-dependencies.version>
<springdoc-openapi-starter-webmvc-api.version>2.5.0
</springdoc-openapi-starter-webmvc-api.version>
<xmlunit-core.version>2.10.0</xmlunit-core.version>

<!-- Plugin versions -->
<git-commit-id-maven-plugin.version>9.0.0</git-commit-id-maven-plugin.version>
Expand Down Expand Up @@ -128,6 +130,16 @@
<version>${lombok.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>${xmlunit-core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -208,37 +220,13 @@
<artifactId>lombok</artifactId>
</exclude>
</excludes>
<image>
<name>${repo.base.url}/${application.name}/${project.artifactId}:${env.IMAGE_TAG}</name>
<env>
<BP_JVM_VERSION>${java.version}</BP_JVM_VERSION>
<BP_SPRING_AOT_ENABLED>true</BP_SPRING_AOT_ENABLED>
<BP_JVM_CDS_ENABLED>true</BP_JVM_CDS_ENABLED>
<BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS
xml:space="preserve">-Xss256K -Xmx${service.heap.size} -Djavax.net.ssl.trustStore=/opt/certificate/cert.jks -Djavax.net.ssl.trustStorePassword=changeit</BPE_APPEND_JAVA_TOOL_OPTIONS>
</env>
</image>
<docker>
<publishRegistry>
<username>${env.REGISTRY_USERNAME}</username>
<password>${env.REGISTRY_PASSWORD}</password>
<url>${env.REGISTRY_HOSTNAME}</url>
</publishRegistry>
</docker>
</configuration>
<executions>
<execution>
<goals>
<goal>build-info</goal>
</goals>
</execution>
<execution>
<id>process-aot</id>
<goals>
<goal>process-aot</goal>
</goals>
</execution>
</executions>
</plugin>

Expand Down Expand Up @@ -447,6 +435,58 @@
</plugins>
</build>
</profile>

<profile>
<id>aot_cds</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
<image>
<name>${repo.base.url}/${application.name}/${project.artifactId}:${env.IMAGE_TAG}
</name>
<env>
<BP_JVM_VERSION>${java.version}</BP_JVM_VERSION>
<BP_SPRING_AOT_ENABLED>true</BP_SPRING_AOT_ENABLED>
<BP_JVM_CDS_ENABLED>true</BP_JVM_CDS_ENABLED>
<BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS
xml:space="preserve">-Xss256K -Xmx${service.heap.size} -Djavax.net.ssl.trustStore=/opt/certificate/cert.jks -Djavax.net.ssl.trustStorePassword=changeit</BPE_APPEND_JAVA_TOOL_OPTIONS>
</env>
</image>
<docker>
<publishRegistry>
<username>${env.REGISTRY_USERNAME}</username>
<password>${env.REGISTRY_PASSWORD}</password>
<url>${env.REGISTRY_HOSTNAME}</url>
</publishRegistry>
</docker>
</configuration>
<executions>
<execution>
<goals>
<goal>build-info</goal>
</goals>
</execution>
<execution>
<id>process-aot</id>
<goals>
<goal>process-aot</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<distributionManagement>
Expand Down

0 comments on commit d026e3c

Please sign in to comment.