Skip to content

Commit d46d235

Browse files
adamretteradamretter
committed
[refactor] Reformat the pom.xml files for consistency
1 parent 968ca24 commit d46d235

File tree

59 files changed

+243
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+243
-221
lines changed

‎elemental-parent/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@
409409
</dependency>
410410
</dependencies>
411411
<configuration>
412-
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
412+
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
413413
<forkCount>${surefire.forkCount}</forkCount>
414414
<reuseForks>${surefire.reuseForks}</reuseForks>
415415
<argLine>@{jacocoArgLine} --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED -Dfile.encoding=${project.build.sourceEncoding}</argLine>
@@ -705,4 +705,4 @@
705705
</repository>
706706
</distributionManagement>
707707

708-
</project>
708+
</project>

‎exist-ant/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172
</multi>
173173
<includes>
174174
<include>pom.xml</include>
175-
<include>src/test/resources/log4j2.xml</include>
176175
<include>src/test/resources-filtered/conf.xml</include>
176+
<include>src/test/resources/log4j2.xml</include>
177177
</includes>
178178
</licenseSet>
179179

@@ -183,14 +183,14 @@
183183
-->
184184
<header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
185185
<excludes>
186-
<exclude>**.txt</exclude>
187186
<exclude>**.md</exclude>
188-
<exclude>**LICENSE</exclude>
187+
<exclude>**.txt</exclude>
189188
<exclude>**.xar</exclude>
190-
<exclude>xquery-license-style.xml</exclude>
189+
<exclude>**LICENSE</exclude>
191190
<exclude>pom.xml</exclude>
192-
<exclude>src/test/resources/log4j2.xml</exclude>
191+
<exclude>xquery-license-style.xml</exclude>
193192
<exclude>src/test/resources-filtered/conf.xml</exclude>
193+
<exclude>src/test/resources/log4j2.xml</exclude>
194194
</excludes>
195195
</licenseSet>
196196
</licenseSets>
@@ -200,4 +200,4 @@
200200

201201
</build>
202202

203-
</project>
203+
</project>

‎exist-core-jcstress/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@
167167
</plugins>
168168
</build>
169169

170-
</project>
170+
</project>

‎exist-core-jmh/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,4 +218,4 @@
218218
</plugins>
219219
</build>
220220

221-
</project>
221+
</project>

‎exist-core/pom.xml‎

Lines changed: 31 additions & 34 deletions
Large diffs are not rendered by default.

‎exist-distribution/pom.xml‎

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,8 @@
386386
<include>src/main/scripts/create-dmg-mac.sh</include>
387387
</includes>
388388
<excludes>
389-
<exclude>src/main/config/**</exclude> <!-- config files in the distribution don't need copyright headers -->
389+
<!-- Config files in the distribution don't need copyright headers -->
390+
<exclude>src/main/config/**</exclude>
390391
</excludes>
391392
</licenseSet>
392393
<licenseSet>
@@ -406,7 +407,8 @@
406407
<include>src/main/xslt/**</include>
407408
</includes>
408409
<excludes>
409-
<exclude>src/main/config/**</exclude> <!-- config files in the distribution don't need copyright headers -->
410+
<!-- Config files in the distribution don't need copyright headers -->
411+
<exclude>src/main/config/**</exclude>
410412
<exclude>src/main/xslt/configure_10_0.dtd</exclude>
411413
<exclude>src/main/xslt/jakartaee_9.xsd</exclude>
412414
<exclude>src/main/xslt/jakartaee_web_services_client_2_0.xsd</exclude>
@@ -772,13 +774,13 @@
772774
</goals>
773775
<configuration>
774776
<target>
775-
<fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar" />
776-
<pathconvert property="dashboard-xar-path" refid="dashboard-fileset" />
777+
<fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar"/>
778+
<pathconvert property="dashboard-xar-path" refid="dashboard-fileset"/>
777779
<unzip src="${dashboard-xar-path}" dest="${expath.pkg.dir}-dashboard-staging/">
778780
<patternset>
779-
<exclude name="resources/images/existdb.png" />
780-
<exclude name="resources/images/existdb-web.svg" />
781-
<exclude name="resources/images/x.svg" />
781+
<exclude name="resources/images/existdb.png"/>
782+
<exclude name="resources/images/existdb-web.svg"/>
783+
<exclude name="resources/images/x.svg"/>
782784
</patternset>
783785
</unzip>
784786
</target>
@@ -792,14 +794,14 @@
792794
</goals>
793795
<configuration>
794796
<target>
795-
<replace file="${expath.pkg.dir}-dashboard-staging/admin.xql" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
796-
<replace file="${expath.pkg.dir}-dashboard-staging/build.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
797-
<replace file="${expath.pkg.dir}-dashboard-staging/doc.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
798-
<replace file="${expath.pkg.dir}-dashboard-staging/guest.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
799-
<replace file="${expath.pkg.dir}-dashboard-staging/index.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
800-
<replace file="${expath.pkg.dir}-dashboard-staging/existdb-dashboard.html" token="existdb-web.svg" value="elemental-web.svg" />
801-
<loadfile property="elemental-web-svg" srcFile="${project.build.outputDirectory}/elemental-web.svg" />
802-
<replaceregexp file="${expath.pkg.dir}-dashboard-staging/bower_components/existdb-launcher/existdb-branding.html" match="&lt;svg.+&lt;/svg&gt;" replace="${elemental-web-svg}" />
797+
<replace file="${expath.pkg.dir}-dashboard-staging/admin.xql" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
798+
<replace file="${expath.pkg.dir}-dashboard-staging/build.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
799+
<replace file="${expath.pkg.dir}-dashboard-staging/doc.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
800+
<replace file="${expath.pkg.dir}-dashboard-staging/guest.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
801+
<replace file="${expath.pkg.dir}-dashboard-staging/index.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
802+
<replace file="${expath.pkg.dir}-dashboard-staging/existdb-dashboard.html" token="existdb-web.svg" value="elemental-web.svg"/>
803+
<loadfile property="elemental-web-svg" srcFile="${project.build.outputDirectory}/elemental-web.svg"/>
804+
<replaceregexp file="${expath.pkg.dir}-dashboard-staging/bower_components/existdb-launcher/existdb-branding.html" match="&lt;svg.+&lt;/svg&gt;" replace="${elemental-web-svg}"/>
803805
</target>
804806
</configuration>
805807
</execution>
@@ -811,11 +813,11 @@
811813
</goals>
812814
<configuration>
813815
<target>
814-
<fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar" />
815-
<pathconvert property="dashboard-xar-path" refid="dashboard-fileset" />
816+
<fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar"/>
817+
<pathconvert property="dashboard-xar-path" refid="dashboard-fileset"/>
816818
<zip destfile="${dashboard-xar-path}">
817-
<fileset dir="${expath.pkg.dir}-dashboard-staging" />
818-
<zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/images/elemental-web.svg" />
819+
<fileset dir="${expath.pkg.dir}-dashboard-staging"/>
820+
<zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/images/elemental-web.svg"/>
819821
</zip>
820822
</target>
821823
</configuration>
@@ -828,13 +830,13 @@
828830
</goals>
829831
<configuration>
830832
<target>
831-
<fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar" />
832-
<pathconvert property="monex-xar-path" refid="monex-fileset" />
833+
<fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar"/>
834+
<pathconvert property="monex-xar-path" refid="monex-fileset"/>
833835
<unzip src="${monex-xar-path}" dest="${expath.pkg.dir}-monex-staging/">
834836
<patternset>
835-
<exclude name="resources/img/exist_icon_16x16.ico" />
836-
<exclude name="resources/img/existdb-logo.png" />
837-
<exclude name="resources/img/powered-by-whiteglass.svg" />
837+
<exclude name="resources/img/exist_icon_16x16.ico"/>
838+
<exclude name="resources/img/existdb-logo.png"/>
839+
<exclude name="resources/img/powered-by-whiteglass.svg"/>
838840
</patternset>
839841
</unzip>
840842
</target>
@@ -848,17 +850,17 @@
848850
</goals>
849851
<configuration>
850852
<target>
851-
<replace file="${expath.pkg.dir}-monex-staging/console.html" token="eXist once" value="" />
852-
<replace file="${expath.pkg.dir}-monex-staging/login.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico" />
853-
<replace file="${expath.pkg.dir}-monex-staging/login.html" token="existdb-logo.png" value="elemental-web.svg" />
854-
<replace file="${expath.pkg.dir}-monex-staging/profiling.html" token="any eXist interface" value="any interface" />
855-
<replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist's scheduler" value="the scheduler" />
856-
<replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="remote eXist-db instances" value="remote instances" />
857-
<replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="the eXist instance" value="the instance" />
858-
<replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist versions before" value="eXist-db versions before" />
859-
<replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico" />
860-
<replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="existdb-logo.png" value="elemental-web.svg" />
861-
<replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="powered-by-whiteglass.svg" value="elemental-web.svg" />
853+
<replace file="${expath.pkg.dir}-monex-staging/console.html" token="eXist once" value=""/>
854+
<replace file="${expath.pkg.dir}-monex-staging/login.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico"/>
855+
<replace file="${expath.pkg.dir}-monex-staging/login.html" token="existdb-logo.png" value="elemental-web.svg"/>
856+
<replace file="${expath.pkg.dir}-monex-staging/profiling.html" token="any eXist interface" value="any interface"/>
857+
<replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist's scheduler" value="the scheduler"/>
858+
<replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="remote eXist-db instances" value="remote instances"/>
859+
<replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="the eXist instance" value="the instance"/>
860+
<replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist versions before" value="eXist-db versions before"/>
861+
<replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico"/>
862+
<replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="existdb-logo.png" value="elemental-web.svg"/>
863+
<replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="powered-by-whiteglass.svg" value="elemental-web.svg"/>
862864
</target>
863865
</configuration>
864866
</execution>
@@ -870,12 +872,12 @@
870872
</goals>
871873
<configuration>
872874
<target>
873-
<fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar" />
874-
<pathconvert property="monex-xar-path" refid="monex-fileset" />
875+
<fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar"/>
876+
<pathconvert property="monex-xar-path" refid="monex-fileset"/>
875877
<zip destfile="${monex-xar-path}">
876-
<fileset dir="${expath.pkg.dir}-monex-staging" />
877-
<zipfileset dir="${project.build.outputDirectory}" includes="elemental-favicon.ico" fullpath="resources/img/elemental-favicon.ico" />
878-
<zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/img/elemental-web.svg" />
878+
<fileset dir="${expath.pkg.dir}-monex-staging"/>
879+
<zipfileset dir="${project.build.outputDirectory}" includes="elemental-favicon.ico" fullpath="resources/img/elemental-favicon.ico"/>
880+
<zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/img/elemental-web.svg"/>
879881
</zip>
880882
</target>
881883
</configuration>
@@ -921,7 +923,7 @@
921923
<goal>copy</goal>
922924
</goals>
923925
<configuration>
924-
<outputDirectory /> <!-- NOTE: this must be empty -->
926+
<outputDirectory/> <!-- NOTE: this must be empty -->
925927
<resources>
926928
<resource>
927929
<workOnFullPath>true</workOnFullPath>
@@ -981,7 +983,7 @@
981983
</goals>
982984
<configuration>
983985
<assembleDirectory>${assemble.dir}</assembleDirectory>
984-
<programs />
986+
<programs/>
985987
<configurationDirectory>etc</configurationDirectory>
986988
<copyConfigurationDirectory>true</copyConfigurationDirectory>
987989
<logsDirectory>logs</logsDirectory>
@@ -1587,4 +1589,4 @@
15871589
</profile>
15881590
</profiles>
15891591

1590-
</project>
1592+
</project>

‎exist-docker/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@
106106
-->
107107
<header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
108108
<excludes>
109+
<exclude>**.md</exclude>
109110
<exclude>pom.xml</exclude>
110111
<exclude>src/assembly/**</exclude>
111-
<exclude>src/main/xslt/**</exclude>
112112
<exclude>src/test/**</exclude>
113-
<exclude>**.md</exclude>
113+
<exclude>src/main/xslt/**</exclude>
114114
</excludes>
115115
</licenseSet>
116116

@@ -248,7 +248,7 @@
248248
</filter>
249249
</filters>
250250
<transformers>
251-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
251+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
252252
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
253253
<addHeader>false</addHeader>
254254
</transformer>
@@ -258,7 +258,7 @@
258258
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
259259
<resource>META-INF/mailcap.default</resource>
260260
</transformer>
261-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
261+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
262262
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
263263
<manifestEntries>
264264
<Multi-Release>true</Multi-Release>
@@ -337,4 +337,4 @@
337337

338338
</plugins>
339339
</build>
340-
</project>
340+
</project>

0 commit comments

Comments
 (0)