From 1e7dfcff06d47ec6a84824e96ae26e317ff5c2e5 Mon Sep 17 00:00:00 2001
From: Yeikel <email@yeikel.com>
Date: Sun, 12 Feb 2023 15:56:56 -0500
Subject: [PATCH] Cache Maven Dists downloaded by the Maven Wrapper

---
 __tests__/cache.test.ts | 6 ++++--
 dist/cleanup/index.js   | 7 +++++--
 dist/setup/index.js     | 7 +++++--
 src/cache.ts            | 7 +++++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/__tests__/cache.test.ts b/__tests__/cache.test.ts
index df7a59bd4..272dc9e19 100644
--- a/__tests__/cache.test.ts
+++ b/__tests__/cache.test.ts
@@ -100,7 +100,7 @@ describe('dependency cache', () => {
         await expect(restore('maven', '')).rejects.toThrow(
           `No file in ${projectRoot(
             workspace
-          )} matched to [**/pom.xml], make sure you have checked out the target repository`
+          )} matched to [**/pom.xml,.mvn/wrapper/maven-wrapper.properties], make sure you have checked out the target repository`
         );
       });
       it('downloads cache', async () => {
@@ -108,7 +108,9 @@ describe('dependency cache', () => {
 
         await restore('maven', '');
         expect(spyCacheRestore).toHaveBeenCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith('**/pom.xml');
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          '**/pom.xml\n.mvn/wrapper/maven-wrapper.properties'
+        );
         expect(spyWarning).not.toHaveBeenCalled();
         expect(spyInfo).toHaveBeenCalledWith('maven cache is not found');
       });
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index df5d6c0eb..2f4de3ae6 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -51467,9 +51467,12 @@ const CACHE_KEY_PREFIX = 'setup-java';
 const supportedPackageManager = [
     {
         id: 'maven',
-        path: [(0, path_1.join)(os_1.default.homedir(), '.m2', 'repository')],
+        path: [
+            (0, path_1.join)(os_1.default.homedir(), '.m2', 'repository'),
+            (0, path_1.join)(os_1.default.homedir(), '.m2', 'wrapper', 'dists')
+        ],
         // https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
-        pattern: ['**/pom.xml']
+        pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
     },
     {
         id: 'gradle',
diff --git a/dist/setup/index.js b/dist/setup/index.js
index fb687e03f..e0cb54bfd 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -77331,9 +77331,12 @@ const CACHE_KEY_PREFIX = 'setup-java';
 const supportedPackageManager = [
     {
         id: 'maven',
-        path: [(0, path_1.join)(os_1.default.homedir(), '.m2', 'repository')],
+        path: [
+            (0, path_1.join)(os_1.default.homedir(), '.m2', 'repository'),
+            (0, path_1.join)(os_1.default.homedir(), '.m2', 'wrapper', 'dists')
+        ],
         // https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
-        pattern: ['**/pom.xml']
+        pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
     },
     {
         id: 'gradle',
diff --git a/src/cache.ts b/src/cache.ts
index 7d13839ee..15739053f 100644
--- a/src/cache.ts
+++ b/src/cache.ts
@@ -23,9 +23,12 @@ interface PackageManager {
 const supportedPackageManager: PackageManager[] = [
   {
     id: 'maven',
-    path: [join(os.homedir(), '.m2', 'repository')],
+    path: [
+      join(os.homedir(), '.m2', 'repository'),
+      join(os.homedir(), '.m2', 'wrapper', 'dists')
+    ],
     // https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
-    pattern: ['**/pom.xml']
+    pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
   },
   {
     id: 'gradle',