Skip to content

Commit 34cf187

Browse files
gnodetclaude
andcommitted
Bump exec-maven-plugin target to 3.5.0 and fix PLUGIN_UPGRADES (PR #12200)
Cherry-pick from fix/mvnup-exec-plugin-3.5.0 branch. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 1539194 commit 34cf187

10 files changed

Lines changed: 160 additions & 2 deletions

.claude/project-name.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Maven
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit c3c156802037e0ee2616721e6356eabed54512b7

.omc/project-memory.json

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
{
2+
"version": "1.0.0",
3+
"lastScanned": 1779113559493,
4+
"projectRoot": "/Users/gnodet/work/maven",
5+
"techStack": {
6+
"languages": [
7+
{
8+
"name": "Java",
9+
"version": null,
10+
"confidence": "high",
11+
"markers": [
12+
"pom.xml"
13+
]
14+
}
15+
],
16+
"frameworks": [],
17+
"packageManager": "maven",
18+
"runtime": null
19+
},
20+
"build": {
21+
"buildCommand": null,
22+
"testCommand": null,
23+
"lintCommand": null,
24+
"devCommand": null,
25+
"scripts": {}
26+
},
27+
"conventions": {
28+
"namingStyle": null,
29+
"importStyle": null,
30+
"testPattern": null,
31+
"fileOrganization": null
32+
},
33+
"structure": {
34+
"isMonorepo": false,
35+
"workspaces": [],
36+
"mainDirectories": [
37+
"src"
38+
],
39+
"gitBranches": {
40+
"defaultBranch": "master",
41+
"branchingStrategy": null
42+
}
43+
},
44+
"customNotes": [],
45+
"directoryMap": {
46+
"apache-maven": {
47+
"path": "apache-maven",
48+
"purpose": null,
49+
"fileCount": 2,
50+
"lastAccessed": 1779113559474,
51+
"keyFiles": [
52+
"README.txt",
53+
"pom.xml"
54+
]
55+
},
56+
"api": {
57+
"path": "api",
58+
"purpose": "API routes",
59+
"fileCount": 1,
60+
"lastAccessed": 1779113559477,
61+
"keyFiles": [
62+
"pom.xml"
63+
]
64+
},
65+
"compat": {
66+
"path": "compat",
67+
"purpose": null,
68+
"fileCount": 1,
69+
"lastAccessed": 1779113559478,
70+
"keyFiles": [
71+
"pom.xml"
72+
]
73+
},
74+
"impl": {
75+
"path": "impl",
76+
"purpose": null,
77+
"fileCount": 1,
78+
"lastAccessed": 1779113559478,
79+
"keyFiles": [
80+
"pom.xml"
81+
]
82+
},
83+
"its": {
84+
"path": "its",
85+
"purpose": null,
86+
"fileCount": 6,
87+
"lastAccessed": 1779113559478,
88+
"keyFiles": [
89+
"README.md",
90+
"pom.xml",
91+
"run-its.bat",
92+
"run-its.sh"
93+
]
94+
},
95+
"src": {
96+
"path": "src",
97+
"purpose": "Source code",
98+
"fileCount": 0,
99+
"lastAccessed": 1779113559478,
100+
"keyFiles": []
101+
},
102+
"target": {
103+
"path": "target",
104+
"purpose": null,
105+
"fileCount": 6,
106+
"lastAccessed": 1779113559479,
107+
"keyFiles": [
108+
"checkstyle-cachefile",
109+
"checkstyle-checker.xml",
110+
"checkstyle-result.xml",
111+
"rat.txt",
112+
"spotless-index"
113+
]
114+
},
115+
"user.home": {
116+
"path": "user.home",
117+
"purpose": null,
118+
"fileCount": 0,
119+
"lastAccessed": 1779113559479,
120+
"keyFiles": []
121+
},
122+
"apache-maven/src": {
123+
"path": "apache-maven/src",
124+
"purpose": "Source code",
125+
"fileCount": 0,
126+
"lastAccessed": 1779113559479,
127+
"keyFiles": []
128+
}
129+
},
130+
"hotPaths": [],
131+
"userDirectives": []
132+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"session_id": "c7fab466-45d5-47ec-b42d-cbc3ba4b3865",
3+
"ended_at": "2026-05-06T10:18:30.392Z",
4+
"reason": "clear",
5+
"agents_spawned": 0,
6+
"agents_completed": 0,
7+
"modes_used": []
8+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"t":0,"agent":"aee5001","agent_type":"unknown","event":"agent_stop","success":true}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"t":0,"agent":"ab46b37","agent_type":"unknown","event":"agent_stop","success":true}

.omc/state/hud-state.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"timestamp": "2026-05-18T14:13:41.160Z",
3+
"backgroundTasks": [],
4+
"sessionStartTimestamp": "2026-05-18T14:12:39.449Z",
5+
"sessionId": "c8c02132-22c0-4fc6-8a31-736bbe4d6e0b"
6+
}

.omc/state/hud-stdin-cache.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"session_id":"c8c02132-22c0-4fc6-8a31-736bbe4d6e0b","transcript_path":"/Users/gnodet/.claude/projects/-Users-gnodet-work-maven/c8c02132-22c0-4fc6-8a31-736bbe4d6e0b.jsonl","cwd":"/Users/gnodet/work/maven","effort":{"level":"max"},"session_name":"Check PR status for Maven PRs","model":{"id":"claude-opus-4-6[1m]","display_name":"Opus 4.6 (1M context)"},"workspace":{"current_dir":"/Users/gnodet/work/maven","project_dir":"/Users/gnodet/work/maven","added_dirs":["/tmp"]},"version":"2.1.143","output_style":{"name":"default"},"cost":{"total_cost_usd":0.78847625,"total_duration_ms":129427,"total_api_duration_ms":138821,"total_lines_added":0,"total_lines_removed":0},"context_window":{"total_input_tokens":92971,"total_output_tokens":1124,"context_window_size":1000000,"current_usage":{"input_tokens":3,"output_tokens":1124,"cache_creation_input_tokens":25378,"cache_read_input_tokens":67590},"used_percentage":9,"remaining_percentage":91},"exceeds_200k_tokens":false,"fast_mode":false,"thinking":{"enabled":true}}

.omc/state/subagent-tracking.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"agents": [],
3+
"total_spawned": 0,
4+
"total_completed": 0,
5+
"total_failed": 0,
6+
"last_updated": "2026-05-18T14:18:18.271Z"
7+
}

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class PluginUpgradeStrategy extends AbstractUpgradeStrategy {
6868
private static final List<PluginUpgrade> PLUGIN_UPGRADES = List.of(
6969
new PluginUpgrade(
7070
DEFAULT_MAVEN_PLUGIN_GROUP_ID, "maven-compiler-plugin", "3.2", MAVEN_4_COMPATIBILITY_REASON),
71-
new PluginUpgrade("org.codehaus.mojo", "exec-maven-plugin", "3.2.0", MAVEN_4_COMPATIBILITY_REASON),
71+
new PluginUpgrade("org.codehaus.mojo", "exec-maven-plugin", "3.5.0", MAVEN_4_COMPATIBILITY_REASON),
7272
new PluginUpgrade(
7373
DEFAULT_MAVEN_PLUGIN_GROUP_ID, "maven-enforcer-plugin", "3.5.0", MAVEN_4_COMPATIBILITY_REASON),
7474
new PluginUpgrade("org.codehaus.mojo", "flatten-maven-plugin", "1.2.7", MAVEN_4_COMPATIBILITY_REASON),
@@ -242,7 +242,7 @@ private Map<String, PluginUpgradeInfo> getPluginUpgradesMap() {
242242
new PluginUpgradeInfo(DEFAULT_MAVEN_PLUGIN_GROUP_ID, "maven-compiler-plugin", "3.2"));
243243
upgrades.put(
244244
"org.codehaus.mojo:exec-maven-plugin",
245-
new PluginUpgradeInfo("org.codehaus.mojo", "exec-maven-plugin", "3.2.0"));
245+
new PluginUpgradeInfo("org.codehaus.mojo", "exec-maven-plugin", "3.5.0"));
246246
upgrades.put(
247247
DEFAULT_MAVEN_PLUGIN_GROUP_ID + ":maven-enforcer-plugin",
248248
new PluginUpgradeInfo(DEFAULT_MAVEN_PLUGIN_GROUP_ID, "maven-enforcer-plugin", "3.5.0"));

0 commit comments

Comments
 (0)