Cache Maven Dists downloaded by the Maven Wrapper

actions · Feb 17, 2023 · a8fc099 · a8fc099
1 parent ea15b3b
commit a8fc099
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/__tests__/cache.test.ts b/__tests__/cache.test.ts
@@ -81,7 +81,7 @@ describe('dependency cache', () => {
  await expect(restore('maven')).rejects.toThrowError(
  `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 () => {

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
@@ -68236,9 +68236,9 @@ const CACHE_KEY_PREFIX = 'setup-java';
 const supportedPackageManager = [
  {
  id: 'maven',
- path: [path_1.join(os_1.default.homedir(), '.m2', 'repository')],
+ path: [path_1.join(os_1.default.homedir(), '.m2', 'repository'), 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
@@ -103439,9 +103439,9 @@ const CACHE_KEY_PREFIX = 'setup-java';
 const supportedPackageManager = [
  {
  id: 'maven',
- path: [path_1.join(os_1.default.homedir(), '.m2', 'repository')],
+ path: [path_1.join(os_1.default.homedir(), '.m2', 'repository'), 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
@@ -23,9 +23,9 @@ 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',