@nx/maven 22.6.0-beta.1 → 22.6.0-beta.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/executors/maven/maven-batch.impl.d.ts.map +1 -1
- package/dist/executors/maven/maven-batch.impl.js +7 -1
- package/dist/executors.json +2 -1
- package/dist/nx-maven-adapters/maven3-adapter.jar +0 -0
- package/dist/nx-maven-adapters/maven4-adapter.jar +0 -0
- package/dist/plugins/maven-data-cache.d.ts +3 -2
- package/dist/plugins/maven-data-cache.d.ts.map +1 -1
- package/dist/plugins/maven-data-cache.js +3 -10
- package/dist/plugins/nodes.js +2 -2
- package/executors.json +2 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maven-batch.impl.d.ts","sourceRoot":"","sources":["../../../src/executors/maven/maven-batch.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAiB,MAAM,YAAY,CAAC;AAKvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAyE/C;;;GAGG;AACH,wBAA+B,kBAAkB,CAC/C,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC3C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"maven-batch.impl.d.ts","sourceRoot":"","sources":["../../../src/executors/maven/maven-batch.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAiB,MAAM,YAAY,CAAC;AAKvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAyE/C;;;GAGG;AACH,wBAA+B,kBAAkB,CAC/C,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC3C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC,CAuHtD"}
|
|
@@ -158,7 +158,13 @@ async function* mavenBatchExecutor(taskGraph, inputs, overrides, context) {
|
|
|
158
158
|
console.error(output);
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
|
-
|
|
161
|
+
// Reject promise if batch runner exited with non-zero code
|
|
162
|
+
if (code !== 0) {
|
|
163
|
+
reject(new Error(`Maven batch runner exited with code ${code}`));
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
resolve();
|
|
167
|
+
}
|
|
162
168
|
});
|
|
163
169
|
child.on('error', reject);
|
|
164
170
|
});
|
package/dist/executors.json
CHANGED
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
"implementation": "./dist/executors/maven/maven.impl",
|
|
6
6
|
"batchImplementation": "./dist/executors/maven/maven-batch.impl",
|
|
7
7
|
"schema": "./dist/executors/maven/schema.json",
|
|
8
|
-
"description": "Runs Maven phases and goals via Maven executable."
|
|
8
|
+
"description": "Runs Maven phases and goals via Maven executable.",
|
|
9
|
+
"preferBatch": true
|
|
9
10
|
}
|
|
10
11
|
}
|
|
11
12
|
}
|
|
Binary file
|
|
Binary file
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
+
import { PluginCache } from 'nx/src/utils/plugin-cache-utils';
|
|
1
2
|
import { MavenAnalysisData } from './types';
|
|
2
3
|
/**
|
|
3
4
|
* Read the Maven targets cache from disk
|
|
4
5
|
*/
|
|
5
|
-
export declare function readMavenCache(cachePath: string):
|
|
6
|
+
export declare function readMavenCache(cachePath: string): PluginCache<MavenAnalysisData>;
|
|
6
7
|
/**
|
|
7
8
|
* Write the Maven targets cache to disk
|
|
8
9
|
*/
|
|
9
|
-
export declare function writeMavenCache(cachePath: string, cache:
|
|
10
|
+
export declare function writeMavenCache(cachePath: string, cache: PluginCache<MavenAnalysisData>): void;
|
|
10
11
|
/**
|
|
11
12
|
* Get the cache path for a given options hash
|
|
12
13
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maven-data-cache.d.ts","sourceRoot":"","sources":["../../src/plugins/maven-data-cache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"maven-data-cache.d.ts","sourceRoot":"","sources":["../../src/plugins/maven-data-cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C;;GAEG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,GAChB,WAAW,CAAC,iBAAiB,CAAC,CAEhC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,GACpC,IAAI,CAEN;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,MAAM,CAOR;AAQD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,CAEjE;AAED,wBAAgB,mBAAmB,IAAI,iBAAiB,GAAG,IAAI,CAE9D"}
|
|
@@ -6,25 +6,18 @@ exports.getCachePath = getCachePath;
|
|
|
6
6
|
exports.setCurrentMavenData = setCurrentMavenData;
|
|
7
7
|
exports.getCurrentMavenData = getCurrentMavenData;
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
-
const
|
|
9
|
+
const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
|
|
10
10
|
/**
|
|
11
11
|
* Read the Maven targets cache from disk
|
|
12
12
|
*/
|
|
13
13
|
function readMavenCache(cachePath) {
|
|
14
|
-
|
|
15
|
-
return process.env.NX_CACHE_PROJECT_GRAPH !== 'false'
|
|
16
|
-
? (0, devkit_1.readJsonFile)(cachePath)
|
|
17
|
-
: {};
|
|
18
|
-
}
|
|
19
|
-
catch {
|
|
20
|
-
return {};
|
|
21
|
-
}
|
|
14
|
+
return new plugin_cache_utils_1.PluginCache(cachePath);
|
|
22
15
|
}
|
|
23
16
|
/**
|
|
24
17
|
* Write the Maven targets cache to disk
|
|
25
18
|
*/
|
|
26
19
|
function writeMavenCache(cachePath, cache) {
|
|
27
|
-
|
|
20
|
+
cache.writeToDisk(cachePath);
|
|
28
21
|
}
|
|
29
22
|
/**
|
|
30
23
|
* Get the cache path for a given options hash
|
package/dist/plugins/nodes.js
CHANGED
|
@@ -39,7 +39,7 @@ exports.createNodes = [
|
|
|
39
39
|
const hash = (0, devkit_1.hashArray)(hashes);
|
|
40
40
|
try {
|
|
41
41
|
// Try to get cached data first (skip cache if in verbose mode)
|
|
42
|
-
let mavenData = isVerbose ? null : mavenCache
|
|
42
|
+
let mavenData = isVerbose ? null : mavenCache.get(hash);
|
|
43
43
|
// If no cached data or cache is stale, run fresh Maven analysis
|
|
44
44
|
if (!mavenData) {
|
|
45
45
|
mavenData = await (0, maven_analyzer_1.runMavenAnalysis)(context.workspaceRoot, {
|
|
@@ -47,7 +47,7 @@ exports.createNodes = [
|
|
|
47
47
|
verbose: isVerbose,
|
|
48
48
|
});
|
|
49
49
|
// Cache the results with the hash
|
|
50
|
-
mavenCache
|
|
50
|
+
mavenCache.set(hash, mavenData);
|
|
51
51
|
}
|
|
52
52
|
// Store in module-level variable for createDependencies to use
|
|
53
53
|
(0, maven_data_cache_1.setCurrentMavenData)(mavenData);
|
package/executors.json
CHANGED
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
"implementation": "./dist/executors/maven/maven.impl",
|
|
6
6
|
"batchImplementation": "./dist/executors/maven/maven-batch.impl",
|
|
7
7
|
"schema": "./dist/executors/maven/schema.json",
|
|
8
|
-
"description": "Runs Maven phases and goals via Maven executable."
|
|
8
|
+
"description": "Runs Maven phases and goals via Maven executable.",
|
|
9
|
+
"preferBatch": true
|
|
9
10
|
}
|
|
10
11
|
}
|
|
11
12
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/maven",
|
|
3
|
-
"version": "22.6.0-beta.
|
|
3
|
+
"version": "22.6.0-beta.11",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Nx plugin for Maven integration",
|
|
6
6
|
"repository": {
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"author": "Victor Savkin",
|
|
47
47
|
"license": "MIT",
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@nx/devkit": "22.6.0-beta.
|
|
49
|
+
"@nx/devkit": "22.6.0-beta.11",
|
|
50
50
|
"@xmldom/xmldom": "^0.8.10",
|
|
51
51
|
"tslib": "^2.3.0"
|
|
52
52
|
},
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"@types/xmldom": "^0.1.34",
|
|
57
57
|
"jest": "^30.0.2",
|
|
58
58
|
"memfs": "^4.9.2",
|
|
59
|
-
"nx": "22.6.0-beta.
|
|
59
|
+
"nx": "22.6.0-beta.11",
|
|
60
60
|
"ts-jest": "^29.4.0",
|
|
61
61
|
"typescript": "~5.9.2"
|
|
62
62
|
},
|