chore(be): Upgraded netty 4.1.115 (#1325)

bcgov · Nov 19, 2024 · 70e5b64 · 70e5b64
1 parent 0b54a86
commit 70e5b64
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.3.5</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>ca.bc.gov.nrs</groupId>
@@ -43,7 +43,7 @@
         <testcontainers.version>1.20.3</testcontainers.version>
         <junit-jupiter-api.version>5.9.1</junit-jupiter-api.version>
         <junit-platform.version>1.9.1</junit-platform.version>
-        <netty.version>4.1.114.Final</netty.version>
+        <netty.version>4.1.115.Final</netty.version>
         <oci.revision>${project.version}</oci.revision>
         <nimbus-jose-jwt.version>9.46</nimbus-jose-jwt.version>
     </properties>
@@ -251,10 +251,10 @@
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
                 <includes>
-                <include>db/**</include>
-                <include>application*</include>
-                <include>static/**</include>
-                <include>templates/**</include>
+                    <include>db/**</include>
+                    <include>application*</include>
+                    <include>static/**</include>
+                    <include>templates/**</include>
                 </includes>
             </resource>
         </resources>
@@ -473,9 +473,11 @@
                                         <scope>runtime</scope>
                                     </excludedScopes>
                                     <excludes>
-                                        <!-- Excluding opentelemetry due to the use of an alpha version that does not match the rest of the versions -->
+                                        <!-- Excluding opentelemetry due to the use of an alpha
+                                        version that does not match the rest of the versions -->
                                         <exclude>io.opentelemetry:opentelemetry-api-incubator</exclude>
-                                        <!-- Excluding jetbrains annotations due to the requirement on kotlin dependencies -->
+                                        <!-- Excluding jetbrains annotations due to the requirement
+                                        on kotlin dependencies -->
                                         <exclude>org.jetbrains:annotations</exclude>
                                     </excludes>
                                 </dependencyConvergence>
@@ -501,7 +503,7 @@
                                     <message>No Snapshots Allowed in releases!</message>
                                     <onlyWhenRelease>true</onlyWhenRelease>
                                 </requireReleaseDeps>
-                                <banDuplicatePomDependencyVersions/>
+                                <banDuplicatePomDependencyVersions />
                             </rules>
                         </configuration>
                     </execution>
@@ -591,6 +593,7 @@
                     <groupId>io.netty</groupId>
                     <artifactId>netty-resolver-dns-native-macos</artifactId>
                     <classifier>osx-aarch_64</classifier>
+                    <version>${netty.version}</version>
                 </dependency>
             </dependencies>
         </profile>
@@ -615,4 +618,4 @@
             </snapshots>
         </repository>
     </repositories>
-</project>
+</project>
diff --git a/legacy/pom.xml b/legacy/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>3.3.5</version>
-    <relativePath/> <!-- lookup parent from repository -->
+    <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
   <groupId>ca.bc.gov.nrs</groupId>
@@ -51,7 +51,7 @@
 
     <oci.revision>${project.version}</oci.revision>
     <mapstruct.version>1.5.5.Fina</mapstruct.version>
-    <netty.version>4.1.114.Final</netty.version>
+    <netty.version>4.1.115.Final</netty.version>
     <flyway.version>10.13.0</flyway.version>
   </properties>
 
@@ -435,9 +435,11 @@
                     <scope>runtime</scope>
                   </excludedScopes>
                   <excludes>
-                    <!-- Excluding opentelemetry due to the use of an alpha version that does not match the rest of the versions -->
+                    <!-- Excluding opentelemetry due to the use of an alpha version that does not
+                    match the rest of the versions -->
                     <exclude>io.opentelemetry:opentelemetry-api-incubator</exclude>
-                    <!-- Excluding jetbrains annotations due to the requirement on kotlin dependencies -->
+                    <!-- Excluding jetbrains annotations due to the requirement on kotlin
+                    dependencies -->
                     <exclude>org.jetbrains:annotations</exclude>
                   </excludes>
                 </dependencyConvergence>
@@ -463,7 +465,7 @@
                   <message>No Snapshots Allowed in releases!</message>
                   <onlyWhenRelease>true</onlyWhenRelease>
                 </requireReleaseDeps>
-                <banDuplicatePomDependencyVersions/>
+                <banDuplicatePomDependencyVersions />
               </rules>
             </configuration>
           </execution>
@@ -553,6 +555,7 @@
           <groupId>io.netty</groupId>
           <artifactId>netty-resolver-dns-native-macos</artifactId>
           <classifier>osx-aarch_64</classifier>
+          <version>${netty.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -578,4 +581,4 @@
     </repository>
   </repositories>
 
-</project>
+</project>