You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/25 11:21:44 UTC
[19/29] james-project git commit: JAMES-2124 Take account of
expandEmptyElements sort parameter
JAMES-2124 Take account of expandEmptyElements sort parameter
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2bc4de89
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2bc4de89
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2bc4de89
Branch: refs/heads/master
Commit: 2bc4de896e33e9b19a97f5a911e6d6dc50ea88aa
Parents: 78e99f3
Author: benwa <bt...@linagora.com>
Authored: Wed Aug 23 10:32:32 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:10 2017 +0700
----------------------------------------------------------------------
mailbox/store/pom.xml | 4 ++++
mpt/antlib/pom.xml | 8 +++----
pom.xml | 48 +++++++++++++++++++--------------------
protocols/smtp/pom.xml | 2 +-
server/app/pom.xml | 14 ++++++------
src/site/xdoc/contribute.xml | 2 +-
6 files changed, 41 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/mailbox/store/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 6261ef0..c6778b9 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -59,6 +59,10 @@
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/mpt/antlib/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/antlib/pom.xml b/mpt/antlib/pom.xml
index 0eec84d..3475a39 100644
--- a/mpt/antlib/pom.xml
+++ b/mpt/antlib/pom.xml
@@ -84,10 +84,10 @@ to the library requiring no extra coding.</description>
<configuration>
<tasks>
<ant antfile="src/test/resources/build.xml" inheritAll="false" inheritRefs="false">
- <property location="${project.build.outputDirectory}" name="jar.name"></property>
- <property location="${basedir}" name="base.dir"></property>
- <property name="test.skipped" value="${maven.test.skip}"></property>
- <property name="test.classpath" refid="maven.test.classpath"></property>
+ <property location="${project.build.outputDirectory}" name="jar.name" />
+ <property location="${basedir}" name="base.dir" />
+ <property name="test.skipped" value="${maven.test.skip}" />
+ <property name="test.classpath" refid="maven.test.classpath" />
</ant>
</tasks>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48e2f22..961f04c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<artifactId>apache</artifactId>
<groupId>org.apache</groupId>
<version>18</version>
- <relativePath></relativePath>
+ <relativePath />
</parent>
<groupId>org.apache.james</groupId>
@@ -82,7 +82,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
<properties>
<Donator>Serge was the original donator of the James code, which has since been massively
improved by people smarter than him. He tries to answer questions on the listserv and make
@@ -97,7 +97,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>sbrewin</id>
@@ -107,7 +107,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>hilmer</id>
@@ -117,7 +117,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>noel</id>
@@ -127,7 +127,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>danny</id>
@@ -139,7 +139,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
<properties>
<Description>Danny is a member of the Apache Software Foundation and married father
of two by night, and by day works as lead technical consultant for the Student Loans
@@ -179,7 +179,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>rdonkin</id>
@@ -189,7 +189,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>niklas</id>
@@ -216,7 +216,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>olegk</id>
@@ -226,7 +226,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>manolo</id>
@@ -236,7 +236,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>eric</id>
@@ -246,7 +246,7 @@
<role>Developer</role>
<role>PMC Chair</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>felixk</id>
@@ -265,7 +265,7 @@
<role>PMC Member</role>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>matthieu</id>
@@ -274,7 +274,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>btellier</id>
@@ -286,7 +286,7 @@
<role>PMC Member</role>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>aduprat</id>
@@ -298,7 +298,7 @@
<role>PMC Member</role>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>rouazana</id>
@@ -309,7 +309,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
</developers>
@@ -578,7 +578,7 @@
This property contains the directory where to deploy when running using "-Psite-reports" profile
to avoid accidently overriding the common modules website. Empty by default.
-->
- <deployTechnicalSiteDirectory></deployTechnicalSiteDirectory>
+ <deployTechnicalSiteDirectory />
<activemq.version>5.15.0</activemq.version>
<apache-mime4j.version>0.8.1</apache-mime4j.version>
@@ -2607,7 +2607,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -2623,7 +2623,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -2639,7 +2639,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -2653,7 +2653,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -2666,7 +2666,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index 36b5884..b27986e 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -134,7 +134,7 @@
</relocation>
</relocations>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"></transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
</transformers>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 1a5feba..5e0d744 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -945,20 +945,20 @@
<!-- 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>
- <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh"></replace>
+ <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" />
<!-- 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>
- <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var"></replace>
+ <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" />
<!-- 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>
+ <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" />
<!-- 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>
- <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh"></replace>
+ <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" />
</tasks>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/src/site/xdoc/contribute.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/contribute.xml b/src/site/xdoc/contribute.xml
index 99f0259..bf1238b 100644
--- a/src/site/xdoc/contribute.xml
+++ b/src/site/xdoc/contribute.xml
@@ -275,7 +275,7 @@
Hopefully, some tools are doing this sorting for you:</li>
</ul>
<pre>
- <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.sortModules=true</code>
+ <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.expandEmptyElements=false</code>
</pre>
<p>You should also split multiple attributes each on a new line.</p>
<p>You should ensure your POM files, as well as sections ordering follows the <a href="http://maven.apache.org/ref/3.0.3/maven-model/maven.html">Maven Model</a></p>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org