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/30 02:14:38 UTC
[1/4] james-project git commit: JAMES-2130 upgrade maven plugins
versions
Repository: james-project
Updated Branches:
refs/heads/master a43b38b0b -> 4b334fc14
JAMES-2130 upgrade maven plugins versions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/33c0a26c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/33c0a26c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/33c0a26c
Branch: refs/heads/master
Commit: 33c0a26ca8d78c2c88d9129edb13714652cf1677
Parents: a43b38b
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Aug 25 15:39:11 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 30 09:12:18 2017 +0700
----------------------------------------------------------------------
mailet/pom.xml | 6 ---
mpt/all/pom.xml | 5 +-
pom.xml | 105 ++++++++++++++++--------------------
server/app/pom.xml | 7 ++-
server/container/cli/pom.xml | 2 +-
server/pom.xml | 2 +-
server/queue/queue-jms/pom.xml | 11 ----
7 files changed, 54 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/33c0a26c/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 4e1d2b6..3ddad03 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -71,11 +71,6 @@
<artifactId>maven-mailetdocs-plugin</artifactId>
<version>${plugin.mailetdocs.version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>versions-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -147,7 +142,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.0</version>
<reportSets>
<reportSet>
<reports>
http://git-wip-us.apache.org/repos/asf/james-project/blob/33c0a26c/mpt/all/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml
index 416c61e..12e1d21 100644
--- a/mpt/all/pom.xml
+++ b/mpt/all/pom.xml
@@ -69,11 +69,10 @@ MPT is a functional test framework specialised for the ASCII line-base protocols
<executions>
<execution>
<id>make-assembly</id>
- <!-- append to the packaging phase. -->
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
- <phase>package</phase>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/33c0a26c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 93b7fcd..7ab89e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2258,18 +2258,23 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
+ <version>3.3.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.8</version>
+ <version>2.12.1</version>
<configuration>
<onlyCurrentVersion>true</onlyCurrentVersion>
<resolutionIds>Fixed</resolutionIds>
@@ -2280,12 +2285,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.6.2</version>
<configuration>
<optimize>true</optimize>
<source>${target.jdk}</source>
@@ -2295,17 +2300,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-doap-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<configuration>
<doapOptions>
<!-- See http://projects.apache.org/languages.html -->
@@ -2347,17 +2352,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10.4</version>
<configuration>
<linksource>true</linksource>
<maxmemory>1g</maxmemory>
@@ -2385,12 +2390,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -2398,12 +2403,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.4</version>
+ <version>3.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <version>3.8</version>
<configuration>
<aggregate>true</aggregate>
<targetJdk>${target.jdk}</targetJdk>
@@ -2421,42 +2426,42 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.6</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.8.1</version>
+ <version>1.9.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -2476,7 +2481,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19</version>
+ <version>2.20</version>
<configuration>
<argLine>-Xms256m -Xmx512m</argLine>
<reuseForks>false</reuseForks>
@@ -2487,7 +2492,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.13</version>
+ <version>2.20</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -2495,12 +2500,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
+ <version>0.12</version>
<configuration>
<excludes>
<exclude>BUILDING.*</exclude>
@@ -2531,12 +2536,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <version>2.7</version>
<configuration>
<aggregate>true</aggregate>
<!--
@@ -2550,12 +2555,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.6.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <version>3.0.5</version>
<configuration>
<!-- required by dashboard plugin and jenkins -->
<xmlOutput>true</xmlOutput>
@@ -2577,7 +2582,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -2668,7 +2673,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
+ <version>1.16</version>
</plugin>
</plugins>
</pluginManagement>
@@ -2676,36 +2681,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
<executions>
<execution>
- <id>jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
- <phase>package</phase>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/33c0a26c/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 65af04e..b56c244 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -679,7 +679,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.10</version>
+ <version>2.0.0</version>
<configuration>
<!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
@@ -932,7 +932,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<goals>
@@ -975,9 +974,9 @@
<execution>
<id>make-assembly</id>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
- <phase>package</phase>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/33c0a26c/server/container/cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index 934d9f7..fe215fc 100644
--- a/server/container/cli/pom.xml
+++ b/server/container/cli/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>james-server-cli</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache James :: Server :: Client</name>
http://git-wip-us.apache.org/repos/asf/james-project/blob/33c0a26c/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index a1d76bb..33bccdf 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -156,8 +156,8 @@
<extensions>true</extensions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.0</version>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/33c0a26c/server/queue/queue-jms/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index ce3d955..a033819 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -111,17 +111,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/4] james-project git commit: JAMES-2130 fix duplicate dependency
Posted by bt...@apache.org.
JAMES-2130 fix duplicate dependency
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/824b7ef6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/824b7ef6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/824b7ef6
Branch: refs/heads/master
Commit: 824b7ef63f7e3b4947b756a435a634c96e204f74
Parents: c271756
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Aug 25 15:41:18 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 30 09:12:26 2017 +0700
----------------------------------------------------------------------
server/container/mailbox-adapter/pom.xml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/824b7ef6/server/container/mailbox-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index 14dd278..08a39a8 100644
--- a/server/container/mailbox-adapter/pom.xml
+++ b/server/container/mailbox-adapter/pom.xml
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/4] james-project git commit: JAMES-2130 prerequisite is only for
plugins
Posted by bt...@apache.org.
JAMES-2130 prerequisite is only for plugins
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c271756a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c271756a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c271756a
Branch: refs/heads/master
Commit: c271756ae1709a444ce1cb85f0da93cdef535abe
Parents: 33c0a26
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Aug 25 15:41:00 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 30 09:12:22 2017 +0700
----------------------------------------------------------------------
pom.xml | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c271756a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7ab89e9..2c8156c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -523,10 +523,6 @@
</mailingList>
</mailingLists>
- <prerequisites>
- <maven>3.0.2</maven>
- </prerequisites>
-
<modules>
<module>backends-common</module>
<module>mailbox</module>
@@ -2680,6 +2676,26 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.3.9</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/4] james-project git commit: JAMES-2130 commons-io has moved
Posted by bt...@apache.org.
JAMES-2130 commons-io has moved
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4b334fc1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4b334fc1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4b334fc1
Branch: refs/heads/master
Commit: 4b334fc14f1a7d0342ad8cd487e041ce810209f5
Parents: 824b7ef
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Aug 25 15:48:26 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 30 09:12:26 2017 +0700
----------------------------------------------------------------------
mailet/crypto/pom.xml | 8 ++++----
pom.xml | 5 -----
protocols/managesieve/pom.xml | 8 ++++----
3 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4b334fc1/mailet/crypto/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index de09bb2..b823d24 100644
--- a/mailet/crypto/pom.xml
+++ b/mailet/crypto/pom.xml
@@ -51,12 +51,12 @@
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4b334fc1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2c8156c..9e229bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1758,11 +1758,6 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>${apache-commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4b334fc1/protocols/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml
index 6fe4f15..b0809b2 100644
--- a/protocols/managesieve/pom.xml
+++ b/protocols/managesieve/pom.xml
@@ -39,6 +39,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
@@ -48,10 +52,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-core</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org