netty-dev-tools use wrong parent pom (#13798)

Motivation: netty-dev-tools used the wrong parent pom and so did not include all the license infos etc. Modifications: Declare the correct parent pom Result: Fixes #13787
netty · Jan 22, 2024 · b52acfe · b52acfe
1 parent ddf1beb
commit b52acfe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -96,6 +96,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-dev-tools</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
       <optional>true</optional>
     </dependency>

diff --git a/dev-tools/pom.xml b/dev-tools/pom.xml
@@ -17,16 +17,12 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-    <relativePath />
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.1.107.Final-SNAPSHOT</version>
   </parent>
 
-  <groupId>io.netty</groupId>
   <artifactId>netty-dev-tools</artifactId>
-  <version>4.1.107.Final-SNAPSHOT</version>
-
   <name>Netty/Dev-Tools</name>
 
   <build>

diff --git a/pom.xml b/pom.xml
@@ -732,12 +732,6 @@
         <optional>true</optional>
       </dependency>
 
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>netty-dev-tools</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
       <!-- Needed for java11 and later as javax.activation is not part of the JDK anymore -->
       <dependency>
         <groupId>com.sun.activation</groupId>
@@ -2103,7 +2097,7 @@
                   <!-- bundledSignature>jdk-system-out</bundledSignature -->
                 </bundledSignatures>
                 <signaturesFiles>
-                  <signaturesFile>${netty.dev.tools.directory}/forbidden/signatures.txt</signaturesFile>
+                  <signaturesFile>../target/dev-tools/forbidden/signatures.txt</signaturesFile>
                 </signaturesFiles>
                 <suppressAnnotations><annotation>**.SuppressForbidden</annotation></suppressAnnotations>
               </configuration>
@@ -2127,7 +2121,7 @@
                   <!-- bundledSignature>jdk-deprecated</bundledSignature -->
                 </bundledSignatures>
                 <signaturesFiles>
-                  <signaturesFile>${netty.dev.tools.directory}/forbidden/signatures.txt</signaturesFile>
+                  <signaturesFile>../target/dev-tools/forbidden/signatures.txt</signaturesFile>
                 </signaturesFiles>
                 <suppressAnnotations><annotation>**.SuppressForbidden</annotation></suppressAnnotations>
               </configuration>