Skip to content

Commit

Permalink
Revert kafka til 3.5.1. Fikser dependencies for EE10.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrsladek
mrsladek committed Oct 30, 2023
1 parent 9b188df commit 0c4f83c
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 28 deletions.
75 changes: 50 additions & 25 deletions ee10/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,50 +24,50 @@
<!-- Java Enterprise -->
<jakarta.jakartaee-bom.version>10.0.0</jakarta.jakartaee-bom.version>

<jetty.version>12.0.0</jetty.version>
<jetty.version>12.0.2</jetty.version>
<jersey.version>3.1.3</jersey.version>

<logback.version>1.4.11</logback.version>

<cxf.version>4.0.2</cxf.version>
<cxf.version>4.0.3</cxf.version>

<weld-core-bom.version>5.1.1.Final</weld-core-bom.version>
<weld-core-bom.version>5.1.2.Final</weld-core-bom.version>

<jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
<jandex.version>2.4.3.Final</jandex.version>
<jandex.version>2.4.4.Final</jandex.version>

<jaxb-bom.version>3.0.1</jaxb-bom.version>
<jaxb-bom.version>4.0.4</jaxb-bom.version>

<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<hibernate.version>6.2.7.Final</hibernate.version>
<hibernate.version>6.3.1.Final</hibernate.version>

<saaj-impl.version>3.0.2</saaj-impl.version>
<xmlsec.version>3.0.3</xmlsec.version>
<saaj-impl.version>3.0.3</saaj-impl.version>
<xmlsec.version>4.0.0</xmlsec.version>

<jakarta.el.version>4.0.0</jakarta.el.version>
<swagger.version>2.2.15</swagger.version>
<jakarta.el.version>4.0.2</jakarta.el.version>
<swagger.version>2.2.18</swagger.version>

<!-- maven jakarta kompatible plugins -->
<jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>

<!-- Andre avhengigheter -->
<prometheus.version>0.16.0</prometheus.version>
<micrometer.version>1.11.3</micrometer.version>
<micrometer.version>1.11.5</micrometer.version>
<metrics.version>4.2.15</metrics.version>

<slf4j.version>2.0.7</slf4j.version>
<slf4j.version>2.0.9</slf4j.version>
<logstash.version>7.4</logstash.version>
<logback-syslog4j.version>1.0.0</logback-syslog4j.version>

<kafka.version>3.5.1</kafka.version>

<hikari.version>5.0.1</hikari.version>
<flyway.version>9.21.2</flyway.version>
<flyway.version>9.22.3</flyway.version>
<postgresql.version>42.6.0</postgresql.version>
<vault-jdbc.version>1.3.10</vault-jdbc.version>

<junit.version>5.10.0</junit.version>
<mockito.version>5.5.0</mockito.version>
<mockito.version>5.6.0</mockito.version>
<assertj.version>3.24.2</assertj.version>

<reflections.version>0.10.2</reflections.version>
Expand Down Expand Up @@ -120,7 +120,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.15.2</version>
<version>2.15.3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -365,6 +365,18 @@
<artifactId>bcprov-jdk15on</artifactId>
<version>1.70</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.76</version>
</dependency>
<!-- https://github.com/advisories/GHSA-hr8g-6v94-x4m9 -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
<version>1.76</version>
</dependency>

<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
Expand All @@ -379,7 +391,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.6</version>
<version>1.14.9</version>
</dependency>

<dependency>
Expand All @@ -395,7 +407,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-compat-spec-parser</artifactId>
<version>1.0.67</version>
<version>1.0.68</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
Expand All @@ -408,12 +420,25 @@
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>

<dependency>
<!-- denne tas inn av com.ibm.mq.jakarta.client, overstyrer med nyere versjon. Trengs denne? -->
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20231013</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<!-- oppdaterer versjon for å bli kvitt CVE-2023-34455 CVE-2023-34454 CVE-2023-34453 -->
<version>1.1.10.5</version>
</dependency>

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>${jakarta.el.version}</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -511,7 +536,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -533,12 +558,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.0</version>
<version>2.16.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -566,7 +591,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.1</version>
<configuration>
<!-- Må ha @{argLine} ellers blir properties satt av jacoco-maven-plugin overkrevet -->
<argLine>@{argLine} ${argLine}</argLine>
Expand All @@ -581,7 +606,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<version>0.8.11</version>
<configuration>
<excludes>
<exclude>**/*no/nav*/**Test.class</exclude>
Expand Down Expand Up @@ -644,12 +669,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.9.1.2184</version>
<version>3.10.0.2594</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- Java Enterprise -->
<jakarta.jakartaee-bom.version>9.1.0</jakarta.jakartaee-bom.version>

<jetty.version>11.0.16</jetty.version>
<jetty.version>11.0.17</jetty.version>
<jersey.version>3.0.11</jersey.version>

<logback.version>1.4.11</logback.version>
Expand All @@ -36,7 +36,7 @@
<jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
<jandex.version>2.4.4.Final</jandex.version>

<jaxb-bom.version>3.0.1</jaxb-bom.version>
<jaxb-bom.version>3.0.2</jaxb-bom.version>

<hibernate-validator.version>7.0.5.Final</hibernate-validator.version>
<hibernate.version>6.1.7.Final</hibernate.version>
Expand All @@ -59,7 +59,7 @@
<logstash.version>7.4</logstash.version>
<logback-syslog4j.version>1.0.0</logback-syslog4j.version>

<kafka.version>3.6.0</kafka.version>
<kafka.version>3.5.1</kafka.version>

<hikari.version>5.0.1</hikari.version>
<flyway.version>9.22.3</flyway.version>
Expand Down

0 comments on commit 0c4f83c

Please sign in to comment.