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/06/30 10:03:50 UTC
[1/2] james-project git commit: JAMES-1765 Upgrade
jmap-integration-testing subprojects to next development iteration
Repository: james-project
Updated Branches:
refs/heads/master 45282dfde -> 02d86a469
JAMES-1765 Upgrade jmap-integration-testing subprojects to next development iteration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5dbd2296
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5dbd2296
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5dbd2296
Branch: refs/heads/master
Commit: 5dbd22964ca982ba662c66b05965a269d64a249c
Parents: 45282df
Author: benwa <bt...@linagora.com>
Authored: Fri Jun 30 11:03:57 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jun 30 11:03:57 2017 +0700
----------------------------------------------------------------------
.../cassandra-jmap-integration-testing/pom.xml | 2 +-
.../memory-jmap-integration-testing/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/5dbd2296/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
index 0b18e08..51782d0 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>jmap-integration-testing</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0.0-RC2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/5dbd2296/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
index f438d54..0033d17 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>jmap-integration-testing</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0.0-RC2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-1765 Fix versions in Spring
Dockerfile
Posted by bt...@apache.org.
JAMES-1765 Fix versions in Spring Dockerfile
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/02d86a46
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/02d86a46
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/02d86a46
Branch: refs/heads/master
Commit: 02d86a46973646dc03881a0657e90608d81b340f
Parents: 5dbd229
Author: benwa <bt...@linagora.com>
Authored: Fri Jun 30 14:18:18 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jun 30 14:18:18 2017 +0700
----------------------------------------------------------------------
dockerfiles/run/spring/Dockerfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/02d86a46/dockerfiles/run/spring/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/Dockerfile b/dockerfiles/run/spring/Dockerfile
index 4999cc2..ab0cdb4 100644
--- a/dockerfiles/run/spring/Dockerfile
+++ b/dockerfiles/run/spring/Dockerfile
@@ -18,18 +18,18 @@ EXPOSE 25 110 143 465 587 993
WORKDIR /root
# Get data we need to run James : build results and configuration
-ADD destination/james-server-app-3.0.0-RC2-SNAPSHOT-app.zip /root/james-server-app-3.0.0-RC2-SNAPSHOT-app.zip
+ADD destination/james-server-app-3.1.0-SNAPSHOT-app.zip /root/james-server-app-3.1.0-SNAPSHOT-app.zip
ADD destination/conf /root/conf
# Unzip build result
-RUN unzip james-server-app-3.0.0-RC2-SNAPSHOT-app.zip
+RUN unzip james-server-app-3.1.0-SNAPSHOT-app.zip
# Copy configuration.
# Warning : we want to use the wrapper.conf file we just compiled.
-RUN cp james-server-app-3.0.0-RC2-SNAPSHOT/conf/wrapper.conf .
-RUN rm -r james-server-app-3.0.0-RC2-SNAPSHOT/conf/*
-RUN cp -r conf/* james-server-app-3.0.0-RC2-SNAPSHOT/conf
-RUN cp wrapper.conf james-server-app-3.0.0-RC2-SNAPSHOT/conf
+RUN cp james-server-app-3.1.0-SNAPSHOT/conf/wrapper.conf .
+RUN rm -r james-server-app-3.1.0-SNAPSHOT/conf/*
+RUN cp -r conf/* james-server-app-3.1.0-SNAPSHOT/conf
+RUN cp wrapper.conf james-server-app-3.1.0-SNAPSHOT/conf
-WORKDIR /root/james-server-app-3.0.0-RC2-SNAPSHOT/bin
+WORKDIR /root/james-server-app-3.1.0-SNAPSHOT/bin
ENTRYPOINT ["./wrapper-linux-x86-64","../conf/wrapper.conf", "wrapper.syslog.ident=james", "wrapper.pidfile=../var/james.pid", "wrapper.daemonize=FALSE"]
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org