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 ie...@apache.org on 2013/01/05 11:23:29 UTC
svn commit: r1429245 - in /james/protocols/trunk: .gitignore api/pom.xml
imap/pom.xml lmtp/pom.xml netty/pom.xml pom.xml pop3/pom.xml smtp/pom.xml
Author: ieugen
Date: Sat Jan 5 10:23:29 2013
New Revision: 1429245
URL: http://svn.apache.org/viewvc?rev=1429245&view=rev
Log:
PROTOCOLS-102 Bumped version numbers
* commons-net 3.2
* commons-lang 2.6
* mime4j 0.7.2
* commons-collection 3.2.1
* commons-codec 1.7
Added:
james/protocols/trunk/.gitignore
Modified:
james/protocols/trunk/api/pom.xml
james/protocols/trunk/imap/pom.xml
james/protocols/trunk/lmtp/pom.xml
james/protocols/trunk/netty/pom.xml
james/protocols/trunk/pom.xml
james/protocols/trunk/pop3/pom.xml
james/protocols/trunk/smtp/pom.xml
Added: james/protocols/trunk/.gitignore
URL: http://svn.apache.org/viewvc/james/protocols/trunk/.gitignore?rev=1429245&view=auto
==============================================================================
--- james/protocols/trunk/.gitignore (added)
+++ james/protocols/trunk/.gitignore Sat Jan 5 10:23:29 2013
@@ -0,0 +1,3 @@
+.idea/
+target
+*.iml
Modified: james/protocols/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1429245&r1=1429244&r2=1429245&view=diff
==============================================================================
--- james/protocols/trunk/api/pom.xml (original)
+++ james/protocols/trunk/api/pom.xml Sat Jan 5 10:23:29 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: james/protocols/trunk/imap/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/pom.xml?rev=1429245&r1=1429244&r2=1429245&view=diff
==============================================================================
--- james/protocols/trunk/imap/pom.xml (original)
+++ james/protocols/trunk/imap/pom.xml Sat Jan 5 10:23:29 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: james/protocols/trunk/lmtp/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1429245&r1=1429244&r2=1429245&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/pom.xml (original)
+++ james/protocols/trunk/lmtp/pom.xml Sat Jan 5 10:23:29 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: james/protocols/trunk/netty/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/netty/pom.xml?rev=1429245&r1=1429244&r2=1429245&view=diff
==============================================================================
--- james/protocols/trunk/netty/pom.xml (original)
+++ james/protocols/trunk/netty/pom.xml Sat Jan 5 10:23:29 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: james/protocols/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1429245&r1=1429244&r2=1429245&view=diff
==============================================================================
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Sat Jan 5 10:23:29 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,14 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
<version>1.8.1</version>
- <relativePath />
+ <relativePath/>
</parent>
<artifactId>protocols</artifactId>
@@ -45,18 +46,22 @@
<module>imap</module>
</modules>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>server-trunk-website</id>
- <url>scpexe://people.apache.org/www/james.apache.org/protocols/</url>
- </site>
- </distributionManagement>
+ <properties>
+ <target.jdk>1.6</target.jdk>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <netty.version>3.3.1.Final</netty.version>
+ <apache-mime4j.version>0.7.2</apache-mime4j.version>
+ <mailbox.version>0.5-SNAPSHOT</mailbox.version>
+ <commons-net.version>3.2</commons-net.version>
+ <commons-lang.version>2.6</commons-lang.version>
+ <commons-codec.version>1.7</commons-codec.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
+ <jmock.version>2.5.1</jmock.version>
+ <jutf7.version>1.0.0</jutf7.version>
+ <junit.version>4.10</junit.version>
+ <geronimo-javamail.version>1.8.3</geronimo-javamail.version>
+ <slf4j.version>1.6.3</slf4j.version>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -100,59 +105,59 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.3</version>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.6.3</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>${version.commons-lang}</version>
+ <version>${commons-lang.version}</version>
</dependency>
-
+
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.3.1.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
- <version>${version.mailbox}</version>
+ <version>${mailbox.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
- <version>${version.mailbox}</version>
+ <version>${mailbox.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+
<!--
START Mail
-->
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
- <version>${version.apache-mime4j}</version>
+ <version>${apache-mime4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
- <version>${version.apache-mime4j}</version>
+ <version>${apache-mime4j.version}</version>
</dependency>
<!--
END Mail
@@ -160,7 +165,7 @@
<dependency>
<groupId>com.beetstra.jutf7</groupId>
<artifactId>jutf7</artifactId>
- <version>1.0.0</version>
+ <version>${jutf7.version}</version>
</dependency>
<!--
@@ -170,46 +175,36 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
- <version>${version.jmock}</version>
+ <version>${jmock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
- <version>${version.jmock}</version>
+ <version>${jmock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.0.1</version>
+ <version>${commons-net.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.3</version>
+ <version>${geronimo-javamail.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
- <pluginManagement>
- <plugins>
- <!-- See https://issues.apache.org/**jira/browse/FELIX-3037<https://issues.apache.org/jira/browse/FELIX-3037>-->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -226,14 +221,18 @@
</plugin>
</plugins>
</build>
- <properties>
- <!-- Use java 5 -->
- <target.jdk>1.5</target.jdk>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.commons-lang>2.4</version.commons-lang>
- <version.commons-collections>3.2.1</version.commons-collections>
- <version.apache-mime4j>0.7</version.apache-mime4j>
- <version.mailbox>0.5-SNAPSHOT</version.mailbox>
- <version.jmock>2.5.1</version.jmock>
- </properties>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/james/protocols/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>server-trunk-website</id>
+ <url>scpexe://people.apache.org/www/james.apache.org/protocols/</url>
+ </site>
+ </distributionManagement>
+
</project>
Modified: james/protocols/trunk/pop3/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/pom.xml?rev=1429245&r1=1429244&r2=1429245&view=diff
==============================================================================
--- james/protocols/trunk/pop3/pom.xml (original)
+++ james/protocols/trunk/pop3/pom.xml Sat Jan 5 10:23:29 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: james/protocols/trunk/smtp/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1429245&r1=1429244&r2=1429245&view=diff
==============================================================================
--- james/protocols/trunk/smtp/pom.xml (original)
+++ james/protocols/trunk/smtp/pom.xml Sat Jan 5 10:23:29 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org