Skip to content

Commit 5d0e4e2

Browse files
Copilotpethers
andcommitted
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
1 parent 2e4c72d commit 5d0e4e2

1 file changed

Lines changed: 26 additions & 25 deletions

File tree

cia-dist-deb/pom.xml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<goals>
121121
<goal>unpack</goal>
122122
</goals>
123-
<phase>compile</phase>
123+
<phase>process-classes</phase>
124124
<configuration>
125125
<artifactItems>
126126
<artifactItem>
@@ -139,7 +139,7 @@
139139
<goals>
140140
<goal>unpack</goal>
141141
</goals>
142-
<phase>compile</phase>
142+
<phase>process-classes</phase>
143143
<configuration>
144144
<artifactItems>
145145
<artifactItem>
@@ -167,31 +167,32 @@
167167
<configuration>
168168
<target>
169169
<!-- Move jetty-home contents up one level to strip version directory -->
170-
<move todir="${project.build.directory}/deb-staging/opt/cia" includeEmptyDirs="true">
171-
<fileset dir="${project.build.directory}/deb-staging/opt/cia/jetty-home-${cia.project.versions.jetty}" />
170+
<move includeEmptyDirs="true" todir="${project.build.directory}/deb-staging/opt/cia">
171+
<fileset dir="${project.build.directory}/deb-staging/opt/cia/jetty-home-${cia.project.versions.jetty}"></fileset>
172172
</move>
173-
<delete dir="${project.build.directory}/deb-staging/opt/cia/jetty-home-${cia.project.versions.jetty}" />
173+
<delete dir="${project.build.directory}/deb-staging/opt/cia/jetty-home-${cia.project.versions.jetty}"></delete>
174174
<!-- Copy config files to staging area -->
175-
<copy file="${basedir}/src/main/config/jetty/bin-fix/jetty.sh" tofile="${project.build.directory}/deb-staging/opt/cia/bin/jetty.sh" />
176-
<copy file="${basedir}/src/main/config/jetty/cia-base/webapps/cia.xml" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/webapps/cia.xml" overwrite="true" /><!-- overwrite WAR-extracted cia.xml with custom config -->
177-
<copy file="${basedir}/src/main/config/jetty/cia-base/resources/jetty-logging.properties" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/resources/jetty-logging.properties" />
178-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/deploy.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/deploy.ini" />
179-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/gzip.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/gzip.ini" />
180-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/http2c.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/http2c.ini" />
181-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/http.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/http.ini" />
182-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/https.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/https.ini" />
183-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/jmx.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/jmx.ini" />
184-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/jsp.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/jsp.ini" />
185-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/jstl.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/jstl.ini" />
186-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/resources.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/resources.ini" />
187-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/server.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/server.ini" />
188-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/ssl.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/ssl.ini" />
189-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/threadpool.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/threadpool.ini" />
190-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/console-capture.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/console-capture.ini" />
191-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/logging-logback.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/logging-logback.ini" />
192-
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/websocket.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/websocket.ini" />
193-
<copy file="${basedir}/src/main/config/etc/default/cia" tofile="${project.build.directory}/deb-staging/etc/default/cia" />
194-
<copy file="${project.build.directory}/keystore.p12" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/etc/keystore.p12" />
175+
<copy file="${basedir}/src/main/config/jetty/bin-fix/jetty.sh" tofile="${project.build.directory}/deb-staging/opt/cia/bin/jetty.sh"></copy>
176+
<copy file="${basedir}/src/main/config/jetty/cia-base/webapps/cia.xml" overwrite="true" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/webapps/cia.xml"></copy>
177+
<!-- overwrite WAR-extracted cia.xml with custom config -->
178+
<copy file="${basedir}/src/main/config/jetty/cia-base/resources/jetty-logging.properties" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/resources/jetty-logging.properties"></copy>
179+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/deploy.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/deploy.ini"></copy>
180+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/gzip.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/gzip.ini"></copy>
181+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/http2c.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/http2c.ini"></copy>
182+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/http.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/http.ini"></copy>
183+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/https.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/https.ini"></copy>
184+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/jmx.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/jmx.ini"></copy>
185+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/jsp.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/jsp.ini"></copy>
186+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/jstl.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/jstl.ini"></copy>
187+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/resources.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/resources.ini"></copy>
188+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/server.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/server.ini"></copy>
189+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/ssl.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/ssl.ini"></copy>
190+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/threadpool.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/threadpool.ini"></copy>
191+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/console-capture.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/console-capture.ini"></copy>
192+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/logging-logback.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/logging-logback.ini"></copy>
193+
<copy file="${basedir}/src/main/config/jetty/cia-base/start.d/websocket.ini" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/start.d/websocket.ini"></copy>
194+
<copy file="${basedir}/src/main/config/etc/default/cia" tofile="${project.build.directory}/deb-staging/etc/default/cia"></copy>
195+
<copy file="${project.build.directory}/keystore.p12" tofile="${project.build.directory}/deb-staging/opt/cia/cia-base/etc/keystore.p12"></copy>
195196
</target>
196197
</configuration>
197198
</execution>

0 commit comments

Comments
 (0)