Commit ac870db
chore: replace unmaintained unix-maven-plugin with jdeb, upgrade Maven to 3.9.14 (#8487)
* Initial plan
* chore: replace unix-maven-plugin with jdeb for .deb packaging
Replace the unmaintained com.stratio.mojo.unix:unix-maven-plugin with
org.vafer:jdeb v1.14 for Debian package creation. This removes the
dependency on Maven 3.9.9 and enables upgrading to Maven 3.9.14.
- Change packaging from 'deb' to 'pom' (jdeb attaches .deb artifact)
- Use maven-dependency-plugin to unpack jetty-home and WAR
- Use maven-antrun-plugin to prepare staging directory
- Use jdeb to assemble the .deb package
- Create src/deb/control/ with control file and maintainer scripts
- Remove unix-maven-plugin from parent-pom plugin management
- Update Maven version from 3.9.9 to 3.9.14 across all workflows,
devcontainer, and documentation
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/cfec7da8-214e-4e03-8dc5-beff1135cf9d
* chore: update release-drafter Maven version and add overwrite comment
Update .deb filename to match release workflow naming convention.
Add explanatory comment for overwrite attribute on cia.xml copy.
Update release-drafter.yml Maven version reference to 3.9.14.
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/cfec7da8-214e-4e03-8dc5-beff1135cf9d
* fix: move dependency-plugin unpack to process-classes phase to fix javadoc:aggregate
The unpack executions at compile phase caused MDEP-98 error during
javadoc:aggregate because the WAR reactor artifact wasn't packaged yet.
Moving to process-classes prevents this since javadoc:aggregate only
forks lifecycle up to compile, while still running before the antrun
staging at prepare-package phase.
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/9a4ef88b-e273-4e4c-8fd1-06b9eaa27784
* fix: apply review comments - idempotent control scripts, fix MDEP-98 in mvn test
- Make preinst idempotent: check if cia user exists before creating
- Make postinst idempotent: use ln -sf, check file existence, track
setup_ok for all operations, idempotent properties update
- Make prerm idempotent: use -f flags, check existence before stop
- Replace maven-dependency-plugin unpack with Ant unzip tasks to fix
MDEP-98 during both javadoc:aggregate AND mvn test reactor builds
(process-classes phase was still reached by mvn test)
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/19ad2014-94dc-48ba-befc-353f23b94af8
* fix: apply review feedback — fix shebangs, guard postrm purge, clean staging dir
- Fix shebangs in all 4 control scripts: '#! /bin/bash' → '#!/bin/bash'
- Guard postrm destructive cleanup with '$1 = purge' to preserve
logs/javamelody on upgrade/remove
- Add staging directory cleanup at start of antrun target to prevent
stale files from prior builds without 'clean'
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/d2c69690-09e1-4709-8b70-4ea468d88ad0
* chore: initial plan for review feedback
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/bc588156-5dfa-401f-acdb-bb07c1116e16
* fix: make cacerts tolerant and use reactor WAR path
- postinst: Missing cacerts is now tolerant (warns but doesn't fail
setup_ok), allowing installs on systems without ca-certificates-java
- pom.xml: WAR now referenced from reactor build output
(../citizen-intelligence-agency/target/) instead of local repository,
so 'mvn clean package' from repo root works without prior 'install'
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/bc588156-5dfa-401f-acdb-bb07c1116e16
* fix: apply review - root:root ownership, nologin shell, jre-headless suggest
- jdeb perm mapper: cia:cia → root:root to prevent privilege escalation
(postinst still sets cia:cia on runtime dirs via chown)
- preinst: use /usr/sbin/nologin instead of /bin/sh for service account
- control: suggest openjdk-21-jre-headless instead of jdk-headless
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/14b48673-6d83-470f-87ee-950f9069e0c9
* fix: set filemode 644 for general files, 600 for keystore.p12; only remove managed cacerts symlink in prerm
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/a4f86eb6-c74c-40a6-a9f1-025e0b8b38b4
* fix: use readlink without -f in prerm to check immediate symlink target
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Hack23/cia/sessions/a4f86eb6-c74c-40a6-a9f1-025e0b8b38b4
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: pethers <1726836+pethers@users.noreply.github.com>1 parent 7d84182 commit ac870db
File tree
23 files changed
+279
-180
lines changed- .devcontainer
- .github
- workflows
- cia-dist-deb
- src/deb/control
- parent-pom
23 files changed
+279
-180
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | | - | |
24 | | - | |
| 23 | + | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | | - | |
| 124 | + | |
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
131 | 131 | | |
132 | 132 | | |
133 | 133 | | |
134 | | - | |
| 134 | + | |
135 | 135 | | |
136 | | - | |
137 | | - | |
| 136 | + | |
| 137 | + | |
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
| |||
301 | 301 | | |
302 | 302 | | |
303 | 303 | | |
304 | | - | |
| 304 | + | |
305 | 305 | | |
306 | 306 | | |
307 | 307 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
| 169 | + | |
170 | 170 | | |
171 | | - | |
172 | | - | |
| 171 | + | |
| 172 | + | |
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
| |||
402 | 402 | | |
403 | 403 | | |
404 | 404 | | |
405 | | - | |
| 405 | + | |
406 | 406 | | |
407 | 407 | | |
408 | 408 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
100 | | - | |
| 100 | + | |
101 | 101 | | |
102 | | - | |
103 | | - | |
| 102 | + | |
| 103 | + | |
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | | - | |
| 123 | + | |
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
| 109 | + | |
110 | 110 | | |
111 | | - | |
112 | | - | |
| 111 | + | |
| 112 | + | |
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
| |||
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
251 | | - | |
| 251 | + | |
252 | 252 | | |
253 | 253 | | |
254 | 254 | | |
| |||
0 commit comments