Bump jib-maven-plugin from 3.1.4 to 3.2.0 (#3201)

* Bump jib-maven-plugin from 3.1.4 to 3.2.0 Bumps [jib-maven-plugin](https://github.com/GoogleContainerTools/jib) from 3.1.4 to 3.2.0. - [Release notes](https://github.com/GoogleContainerTools/jib/releases) - [Commits](https://github.com/GoogleContainerTools/jib/commits) --- updated-dependencies: - dependency-name: com.google.cloud.tools:jib-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix jib regression Signed-off-by: Steven Sheehy <steven.sheehy@hedera.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steven Sheehy <steven.sheehy@hedera.com>
hashgraph · Jan 26, 2022 · 316c6ae · 316c6ae
1 parent 5f20005
commit 316c6ae
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 62 deletions.
diff --git a/hedera-mirror-grpc/pom.xml b/hedera-mirror-grpc/pom.xml
@@ -219,6 +219,13 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
+                <configuration>
+                    <extraDirectories>
+                        <paths>
+                            <path>${docker.resources}</path>
+                        </paths>
+                    </extraDirectories>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

diff --git a/hedera-mirror-importer/pom.xml b/hedera-mirror-importer/pom.xml
@@ -320,6 +320,13 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
+                <configuration>
+                    <extraDirectories>
+                        <paths>
+                            <path>${docker.resources}</path>
+                        </paths>
+                    </extraDirectories>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

diff --git a/hedera-mirror-monitor/pom.xml b/hedera-mirror-monitor/pom.xml
@@ -157,21 +157,6 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.googlecode.maven-download-plugin</groupId>
-                <artifactId>download-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <excludedScopes>test</excludedScopes>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>

diff --git a/hedera-mirror-test/pom.xml b/hedera-mirror-test/pom.xml
@@ -137,47 +137,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <includeScope>test</includeScope>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>download-licenses-for-container</id>
-                        <configuration>
-                            <licenseUrlReplacements>
-                                <licenseUrlReplacement>
-                                    <regexp>\Qhttps://github.com/mockito/mockito/blob/master/LICENSE\E</regexp>
-                                    <replacement>https://github.com/mockito/mockito/blob/release/3.x/LICENSE
-                                    </replacement>
-                                </licenseUrlReplacement>
-                                <licenseUrlReplacement>
-                                    <regexp>\Qhttp://asm.objectweb.org/license.html\E</regexp>
-                                    <replacement>https://asm.ow2.io/license.html</replacement>
-                                </licenseUrlReplacement>
-                                <licenseUrlReplacement>
-                                    <regexp>
-                                        \Qhttp://jtidy.svn.sourceforge.net/viewvc/jtidy/trunk/jtidy/LICENSE.txt?revision=95\E
-                                    </regexp>
-                                    <replacement>http://jtidy.sourceforge.net/license.html</replacement>
-                                </licenseUrlReplacement>
-                            </licenseUrlReplacements>
-                            <licensesConfigFile>${project.basedir}/src/test/resources/license/licenses.xml
-                            </licensesConfigFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
         <jacoco.version>0.8.7</jacoco.version>
         <java.version>11</java.version>
         <javax.version>1</javax.version>
-        <jib.version>3.1.4</jib.version>
+        <jib.version>3.2.0</jib.version>
         <log4j2.version>2.17.1</log4j2.version> <!-- Temporarily added to address a vulnerability -->
         <micrometer-jvm-extras.version>0.2.2</micrometer-jvm-extras.version>
         <msgpack.version>0.9.0</msgpack.version>
@@ -257,11 +257,6 @@
                                 <jvmFlag>-XX:MaxRAMPercentage=80</jvmFlag>
                             </jvmFlags>
                         </container>
-                        <extraDirectories>
-                            <paths>
-                                <path>${docker.resources}</path>
-                            </paths>
-                        </extraDirectories>
                         <to>
                             <image>${docker.push.repository}/${project.artifactId}:${docker.tag.version}</image>
                         </to>