Skip to content

Commit 5e4a615

Browse files
committed
Cache Maven Dists downloaded by the Maven Wrapper
1 parent b622de1 commit 5e4a615

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

__tests__/cache.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ describe('dependency cache', () => {
100100
await expect(restore('maven', '')).rejects.toThrow(
101101
`No file in ${projectRoot(
102102
workspace
103-
)} matched to [**/pom.xml], make sure you have checked out the target repository`
103+
)} matched to [**/pom.xml,.mvn/wrapper/maven-wrapper.properties], make sure you have checked out the target repository`
104104
);
105105
});
106106
it('downloads cache', async () => {
107107
createFile(join(workspace, 'pom.xml'));
108108

109109
await restore('maven', '');
110110
expect(spyCacheRestore).toHaveBeenCalled();
111-
expect(spyGlobHashFiles).toHaveBeenCalledWith('**/pom.xml');
111+
expect(spyGlobHashFiles).toHaveBeenCalledWith('**/pom.xml\n.mvn/wrapper/maven-wrapper.properties');
112112
expect(spyWarning).not.toHaveBeenCalled();
113113
expect(spyInfo).toHaveBeenCalledWith('maven cache is not found');
114114
});

dist/cleanup/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51467,9 +51467,9 @@ const CACHE_KEY_PREFIX = 'setup-java';
5146751467
const supportedPackageManager = [
5146851468
{
5146951469
id: 'maven',
51470-
path: [(0, path_1.join)(os_1.default.homedir(), '.m2', 'repository')],
51470+
path: [(0, path_1.join)(os_1.default.homedir(), '.m2', 'repository'), (0, path_1.join)(os_1.default.homedir(), '.m2', 'wrapper', 'dists')],
5147151471
// https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
51472-
pattern: ['**/pom.xml']
51472+
pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
5147351473
},
5147451474
{
5147551475
id: 'gradle',

dist/setup/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77331,9 +77331,9 @@ const CACHE_KEY_PREFIX = 'setup-java';
7733177331
const supportedPackageManager = [
7733277332
{
7733377333
id: 'maven',
77334-
path: [(0, path_1.join)(os_1.default.homedir(), '.m2', 'repository')],
77334+
path: [(0, path_1.join)(os_1.default.homedir(), '.m2', 'repository'), (0, path_1.join)(os_1.default.homedir(), '.m2', 'wrapper', 'dists')],
7733577335
// https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
77336-
pattern: ['**/pom.xml']
77336+
pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
7733777337
},
7733877338
{
7733977339
id: 'gradle',

src/cache.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ interface PackageManager {
2323
const supportedPackageManager: PackageManager[] = [
2424
{
2525
id: 'maven',
26-
path: [join(os.homedir(), '.m2', 'repository')],
26+
path: [join(os.homedir(), '.m2', 'repository'), join(os.homedir(), '.m2', 'wrapper', 'dists')],
2727
// https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
28-
pattern: ['**/pom.xml']
28+
pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
2929
},
3030
{
3131
id: 'gradle',

0 commit comments

Comments
 (0)