Upgrade transitive dep for security reasons; add source artifacts

mishmash-io · Dec 27, 2024 · 0a880b9 · 0a880b9
1 parent 93484fb
commit 0a880b9
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 32 deletions.
diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
@@ -162,26 +162,6 @@
         <artifactId>jul-to-slf4j</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-jul</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-core</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-api</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-slf4j2-impl</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
 
       <!-- http dependencies -->
       <dependency>
@@ -590,6 +570,11 @@
         <artifactId>xmlunit-placeholders</artifactId>
         <version>2.10.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
+        <version>2.2.4</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/pom.xml b/pom.xml
@@ -131,6 +131,26 @@
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-jul</artifactId>
+        <version>${log4j2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+        <version>${log4j2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-api</artifactId>
+        <version>${log4j2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-slf4j2-impl</artifactId>
+        <version>${log4j2.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>

diff --git a/zookeeper/stable-admin-jetty/pom.xml b/zookeeper/stable-admin-jetty/pom.xml
@@ -144,7 +144,7 @@
                   </includes>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
+              <outputDirectory>${project.build.directory}/sources/java</outputDirectory>
             </configuration>
           </execution>
         </executions>
@@ -161,12 +161,24 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-sources/java</source>
+                <source>${project.build.directory}/sources/java</source>
               </sources>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/zookeeper/stable-cli/pom.xml b/zookeeper/stable-cli/pom.xml
@@ -151,7 +151,7 @@
                   </includes>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
+              <outputDirectory>${project.build.directory}/sources/java</outputDirectory>
             </configuration>
           </execution>
         </executions>
@@ -168,12 +168,24 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-sources/java</source>
+                <source>${project.build.directory}/sources/java</source>
               </sources>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/zookeeper/stable-client/pom.xml b/zookeeper/stable-client/pom.xml
@@ -107,6 +107,16 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
@@ -180,7 +190,7 @@
                   </excludes>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
+              <outputDirectory>${project.build.directory}/sources/java</outputDirectory>
             </configuration>
           </execution>
         </executions>
@@ -212,7 +222,7 @@
                   </includes>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/generated-test-sources/java</outputDirectory>
+              <outputDirectory>${project.build.directory}/test-sources/java</outputDirectory>
             </configuration>
           </execution-->
         </executions>
@@ -229,7 +239,7 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-sources/java</source>
+                <source>${project.build.directory}/sources/java</source>
               </sources>
             </configuration>
           </execution>
@@ -247,7 +257,7 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-test-sources/java</source>
+                <source>${project.build.directory}/test-sources/java</source>
               </sources>
             </configuration>
           </execution>

diff --git a/zookeeper/stable-controller/pom.xml b/zookeeper/stable-controller/pom.xml
@@ -140,7 +140,7 @@
                   </includes>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
+              <outputDirectory>${project.build.directory}/sources/java</outputDirectory>
             </configuration>
           </execution>
         </executions>
@@ -157,12 +157,24 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-sources/java</source>
+                <source>${project.build.directory}/sources/java</source>
               </sources>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/zookeeper/stable-server/pom.xml b/zookeeper/stable-server/pom.xml
@@ -165,7 +165,7 @@
                   </includes>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
+              <outputDirectory>${project.build.directory}/sources/java</outputDirectory>
             </configuration>
           </execution>
         </executions>
@@ -182,12 +182,24 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-sources/java</source>
+                <source>${project.build.directory}/sources/java</source>
               </sources>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>