Skip to content

Commit

Permalink
Bump Alpine to 2.2.3 (#327)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nscuro
nscuro authored Sep 25, 2023
1 parent b8e5244 commit 632bfd7
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 1,010 deletions.
107 changes: 1 addition & 106 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>us.springett</groupId>
<artifactId>alpine-parent</artifactId>
<version>2.2.2</version>
<version>2.2.3</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -199,34 +199,6 @@
<artifactId>cvss-calculator</artifactId>
<version>${lib.cvss-calculator.version}</version>
</dependency>
<dependency>
<!-- Direct dependency is required to be able to use it as WAR overlay. -->
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${lib.jackson.version}</version>
</dependency>
<dependency>
<!-- Direct dependency is required to be able to use it as WAR overlay. -->
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${lib.jackson.version}</version>
</dependency>
<dependency>
<!-- Direct dependency is required to be able to use it as WAR overlay. -->
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${lib.jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${lib.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${lib.jackson.version}</version>
</dependency>
<!-- OWASP Risk Rating calculator -->
<dependency>
<groupId>us.springett</groupId>
Expand Down Expand Up @@ -285,11 +257,6 @@
<artifactId>kafka-streams-test-utils</artifactId>
<version>${lib.kafka.version}</version>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>${lib.logstash-logback-encoder.version}</version>
</dependency>
<!-- shedlock dependencies -->
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
Expand Down Expand Up @@ -396,11 +363,6 @@
<artifactId>resilience4j-retry</artifactId>
<version>${lib.resilience4j.version}</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-ratelimiter</artifactId>
<version>${lib.resilience4j.version}</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-micrometer</artifactId>
Expand Down Expand Up @@ -597,73 +559,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<!--
Overriding the default plugin configuration provided by Alpine
in order to include overlays necessary for logging in JSON format.
https://github.com/DependencyTrack/hyades/issues/619
The logback JSON encoder dependencies must be available to the JVM even *BEFORE*
the WAR is loaded. That's why just adding these as dependencies like usual does not suffice.
https://maven.apache.org/plugins/maven-war-plugin/overlays.html
Original plugin configuration can be found here:
https://github.com/stevespringett/Alpine/blob/alpine-parent-2.2.2/pom.xml#L937-L968
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven.war.plugin.version}</version>
<configuration>
<warName>${war-embedded-finalname}</warName>
<archive>
<manifest>
<mainClass>alpine.embedded.EmbeddedJettyServer</mainClass>
</manifest>
</archive>
<packagingExcludes>WEB-INF/lib/executable-war-*.jar</packagingExcludes>
<dependentWarExcludes>WEB-INF/lib/*log4j*.jar,WEB-INF/lib/*slf4j*.jar</dependentWarExcludes>
<overlays>
<!-- Overlay required for Alpine per default. -->
<overlay>
<groupId>us.springett</groupId>
<artifactId>alpine-executable-war</artifactId>
<type>jar</type>
</overlay>
<overlay>
<groupId>org.owasp</groupId>
<artifactId>security-logging-common</artifactId>
<type>jar</type>
</overlay>
<overlay>
<groupId>org.owasp</groupId>
<artifactId>security-logging-logback</artifactId>
<type>jar</type>
</overlay>

<!-- Logback JSON encoder and its dependencies. -->
<overlay>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<type>jar</type>
</overlay>
<overlay>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<type>jar</type>
</overlay>
<overlay>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<type>jar</type>
</overlay>
<overlay>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<type>jar</type>
</overlay>
</overlays>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand Down
Loading

0 comments on commit 632bfd7

Please sign in to comment.