This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9fa8c36c914050e6e15cbdc7f097639d1adbd915 Author: Jean Helou <[email protected]> AuthorDate: Wed Nov 18 11:46:26 2020 +0100 JAMES-2124 Sorts all plugins configuration --- mailet/crypto/pom.xml | 2 +- pom.xml | 38 +++++++++++----------- server/app/pom.xml | 16 ++++----- .../container/guice/testing/custom-mailets/pom.xml | 2 +- server/protocols/webadmin-cli/pom.xml | 6 ++-- server/protocols/webadmin/webadmin-data/pom.xml | 2 +- .../webadmin-mailbox-deleted-message-vault/pom.xml | 2 +- server/protocols/webadmin/webadmin-mailbox/pom.xml | 2 +- .../protocols/webadmin/webadmin-mailqueue/pom.xml | 2 +- .../webadmin/webadmin-mailrepository/pom.xml | 2 +- .../protocols/webadmin/webadmin-rabbitmq/pom.xml | 2 +- server/protocols/webadmin/webadmin-swagger/pom.xml | 2 +- 12 files changed, 38 insertions(+), 40 deletions(-) diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml index b72d120..b0604cc 100644 --- a/mailet/crypto/pom.xml +++ b/mailet/crypto/pom.xml @@ -86,10 +86,10 @@ <executions> <execution> <id>make-assembly</id> - <phase>package</phase> <goals> <goal>single</goal> </goals> + <phase>package</phase> </execution> </executions> </plugin> diff --git a/pom.xml b/pom.xml index bf064ca..240c8e2 100644 --- a/pom.xml +++ b/pom.xml @@ -2821,32 +2821,32 @@ <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> <version>3.4.4</version> + <configuration> + <args> + <arg>-Xlog-implicits</arg> + <arg>-feature</arg> + <arg>-unchecked</arg> + <arg>-deprecation</arg> + <arg>-explaintypes</arg> + </args> + </configuration> <executions> <execution> <id>scala-compile-first</id> - <phase>process-resources</phase> <goals> <goal>add-source</goal> <goal>compile</goal> </goals> + <phase>process-resources</phase> </execution> <execution> <id>scala-test-compile</id> - <phase>process-test-resources</phase> <goals> <goal>testCompile</goal> </goals> + <phase>process-test-resources</phase> </execution> </executions> - <configuration> - <args> - <arg>-Xlog-implicits</arg> - <arg>-feature</arg> - <arg>-unchecked</arg> - <arg>-deprecation</arg> - <arg>-explaintypes</arg> - </args> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -3359,14 +3359,6 @@ <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> - <executions> - <execution> - <id>get-the-git-infos</id> - <goals> - <goal>revision</goal> - </goals> - </execution> - </executions> <configuration> <dotGitDirectory>${project.basedir}/.git</dotGitDirectory> <prefix>git</prefix> @@ -3389,6 +3381,14 @@ <dirty>-dirty</dirty> </gitDescribe> </configuration> + <executions> + <execution> + <id>get-the-git-infos</id> + <goals> + <goal>revision</goal> + </goals> + </execution> + </executions> </plugin> </plugins> <extensions> diff --git a/server/app/pom.xml b/server/app/pom.xml index 0d96ef9..157e7a4 100644 --- a/server/app/pom.xml +++ b/server/app/pom.xml @@ -844,21 +844,21 @@ <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path from the lib dir to make windows happy again --> - <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib" /> - <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh" /> + <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib"></replace> + <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh"></replace> <!-- this is needed because appassembler is not really smart on some settings --> - <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar" /> - <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var" /> - <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="setenv" value="setenv.sh" /> + <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar"></replace> + <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var"></replace> + <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="setenv" value="setenv.sh"></replace> <!-- copy the linux wrapper-linux-x86-32 to wrapper, so use it as default if no matching wrapper was found --> - <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" /> + <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper"></copy> <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path from the lib dir to make windows happy again --> - <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib" /> - <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh" /> + <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib"></replace> + <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh"></replace> </tasks> </configuration> diff --git a/server/container/guice/testing/custom-mailets/pom.xml b/server/container/guice/testing/custom-mailets/pom.xml index 563645e..ca42a9a 100644 --- a/server/container/guice/testing/custom-mailets/pom.xml +++ b/server/container/guice/testing/custom-mailets/pom.xml @@ -60,10 +60,10 @@ <executions> <execution> <id>make-assembly</id> - <phase>package</phase> <goals> <goal>single</goal> </goals> + <phase>package</phase> </execution> </executions> </plugin> diff --git a/server/protocols/webadmin-cli/pom.xml b/server/protocols/webadmin-cli/pom.xml index 2d488df..41ab1e7 100644 --- a/server/protocols/webadmin-cli/pom.xml +++ b/server/protocols/webadmin-cli/pom.xml @@ -82,16 +82,14 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <phase>package</phase> <goals> <goal>single</goal> </goals> + <phase>package</phase> <configuration> <archive> <manifest> - <mainClass> - org.apache.james.cli.WebAdminCli - </mainClass> + <mainClass>org.apache.james.cli.WebAdminCli</mainClass> </manifest> </archive> <descriptorRefs> diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index 6e5d4f7..13cf9a5 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -153,10 +153,10 @@ </configuration> <executions> <execution> - <phase>compile</phase> <goals> <goal>generate</goal> </goals> + <phase>compile</phase> </execution> </executions> </plugin> diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml index 2e8b984..d175379 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml @@ -173,10 +173,10 @@ </configuration> <executions> <execution> - <phase>compile</phase> <goals> <goal>generate</goal> </goals> + <phase>compile</phase> </execution> </executions> </plugin> diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index 23b464b..9df135a 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -252,10 +252,10 @@ </configuration> <executions> <execution> - <phase>compile</phase> <goals> <goal>generate</goal> </goals> + <phase>compile</phase> </execution> </executions> </plugin> diff --git a/server/protocols/webadmin/webadmin-mailqueue/pom.xml b/server/protocols/webadmin/webadmin-mailqueue/pom.xml index 450f86d..34e3027 100644 --- a/server/protocols/webadmin/webadmin-mailqueue/pom.xml +++ b/server/protocols/webadmin/webadmin-mailqueue/pom.xml @@ -135,10 +135,10 @@ </configuration> <executions> <execution> - <phase>compile</phase> <goals> <goal>generate</goal> </goals> + <phase>compile</phase> </execution> </executions> </plugin> diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml index 9b0723d..6d0b4d3 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml +++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml @@ -158,10 +158,10 @@ </configuration> <executions> <execution> - <phase>compile</phase> <goals> <goal>generate</goal> </goals> + <phase>compile</phase> </execution> </executions> </plugin> diff --git a/server/protocols/webadmin/webadmin-rabbitmq/pom.xml b/server/protocols/webadmin/webadmin-rabbitmq/pom.xml index 3132725..d4940c1 100644 --- a/server/protocols/webadmin/webadmin-rabbitmq/pom.xml +++ b/server/protocols/webadmin/webadmin-rabbitmq/pom.xml @@ -143,10 +143,10 @@ </configuration> <executions> <execution> - <phase>compile</phase> <goals> <goal>generate</goal> </goals> + <phase>compile</phase> </execution> </executions> </plugin> diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml index 77170da..706beba 100644 --- a/server/protocols/webadmin/webadmin-swagger/pom.xml +++ b/server/protocols/webadmin/webadmin-swagger/pom.xml @@ -65,10 +65,10 @@ </configuration> <executions> <execution> - <phase>compile</phase> <goals> <goal>generate</goal> </goals> + <phase>compile</phase> </execution> </executions> </plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
