merge: #7947

7947: [Backport stable/1/2] build: do not include netty in zeebe bom r=deepthidevaki a=deepthidevaki Backport #7946 closes #7938 Co-authored-by: Deepthi Devaki Akkoorath <[email protected]>
camunda · Oct 7, 2021 · 83a4a27 · 83a4a27
2 parents d0c41b4 + f81b6fe
commit 83a4a27
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -14,7 +14,7 @@
     <artifactId>camunda-release-parent</artifactId>
     <version>3.8.1</version>
     <!-- do not remove empty tag - http://jira.codehaus.org/browse/MNG-4687 -->
-    <relativePath />
+    <relativePath/>
   </parent>
 
   <properties>
@@ -26,8 +26,6 @@
     </nexus.release.repository>
     <nexus.sonatype.url>https://s01.oss.sonatype.org</nexus.sonatype.url>
 
-    <version.netty>4.1.68.Final</version.netty>
-
     <version.java>11</version.java>
     <plugin.version.javadoc>3.3.1</plugin.version.javadoc>
   </properties>
@@ -221,13 +219,6 @@
         <version>${project.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-bom</artifactId>
-        <version>${version.netty}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -69,6 +69,7 @@
     <version.model>7.7.0</version.model>
     <version.msgpack>0.9.0</version.msgpack>
     <version.netty-tcnative>2.0.43.Final</version.netty-tcnative>
+    <version.netty>4.1.68.Final</version.netty>
     <version.objenesis>3.2</version.objenesis>
     <version.prometheus>0.12.0</version.prometheus>
     <version.protobuf>3.18.0</version.protobuf>
@@ -425,6 +426,14 @@
         <version>${version.netty-tcnative}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>${version.netty}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.elasticsearch</groupId>
         <artifactId>elasticsearch-x-content</artifactId>