james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rouaz...@apache.org
Subject [12/13] james-project git commit: JAMES-1858: Remove the version from artifact names
Date Wed, 07 Dec 2016 08:53:40 GMT
JAMES-1858: Remove the version from artifact names


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/85f5c11a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/85f5c11a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/85f5c11a

Branch: refs/heads/master
Commit: 85f5c11a630c73ec38a7656da63e8cf79deb5fe4
Parents: d8d8d4f
Author: Quynh Nguyen <qnguyen@linagora.com>
Authored: Thu Nov 24 15:27:00 2016 +0700
Committer: Quynh Nguyen <qnguyen@linagora.com>
Committed: Wed Dec 7 14:03:53 2016 +0700

----------------------------------------------------------------------
 dockerfiles/compilation/java-8/compile.sh      | 18 ++++++++----------
 dockerfiles/run/guice/cassandra/Dockerfile     |  8 ++++----
 dockerfiles/run/guice/jpa/Dockerfile           | 10 +++++-----
 server/container/cli/pom.xml                   |  5 +++--
 server/container/guice/cassandra-guice/pom.xml |  5 +++--
 server/container/guice/jpa-guice/pom.xml       |  5 +++--
 6 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/85f5c11a/dockerfiles/compilation/java-8/compile.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/compilation/java-8/compile.sh b/dockerfiles/compilation/java-8/compile.sh
index 8012a9d..23eb8aa 100755
--- a/dockerfiles/compilation/java-8/compile.sh
+++ b/dockerfiles/compilation/java-8/compile.sh
@@ -54,18 +54,16 @@ fi
 
 if [ $? -eq 0 ]; then
    if [ -d "$CASSANDRA_DESTINATION" ]; then
-      cp server/app/target/james-server-app-*-app.zip $CASSANDRA_DESTINATION || true
-      cp server/container/guice/cassandra-guice/target/james-server-cassandra-guice-*-SNAPSHOT.jar
$CASSANDRA_DESTINATION || true
-      cp -r server/container/guice/cassandra-guice/target/james-server-cassandra-guice-*-SNAPSHOT.lib
$CASSANDRA_DESTINATION || true
-      cp server/container/cli/target/james-server-cli-*.jar $CASSANDRA_DESTINATION || true
-      cp -r server/container/cli/target/james-server-cli-*.lib $CASSANDRA_DESTINATION ||
true
+      cp server/container/guice/cassandra-guice/target/james-server-cassandra-guice.jar $CASSANDRA_DESTINATION
|| true
+      cp -r server/container/guice/cassandra-guice/target/james-server-cassandra-guice.lib
$CASSANDRA_DESTINATION || true
+      cp server/container/cli/target/james-server-cli.jar $CASSANDRA_DESTINATION || true
+      cp -r server/container/cli/target/james-server-cli.lib $CASSANDRA_DESTINATION || true
    fi
 
    if [ -d "$JPA_DESTINATION" ]; then
-      cp server/app/target/james-server-app-*-app.zip $JPA_DESTINATION || true
-      cp server/container/guice/jpa-guice/target/james-server-jpa-guice-*-SNAPSHOT.jar $JPA_DESTINATION
|| true
-      cp -r server/container/guice/jpa-guice/target/james-server-jpa-guice-*-SNAPSHOT.lib
$JPA_DESTINATION || true
-      cp server/container/cli/target/james-server-cli-*.jar $JPA_DESTINATION || true
-      cp -r server/container/cli/target/james-server-cli-*.lib $JPA_DESTINATION || true
+      cp server/container/guice/jpa-guice/target/james-server-jpa-guice.jar $JPA_DESTINATION
|| true
+      cp -r server/container/guice/jpa-guice/target/james-server-jpa-guice.lib $JPA_DESTINATION
|| true
+      cp server/container/cli/target/james-server-cli.jar $JPA_DESTINATION || true
+      cp -r server/container/cli/target/james-server-cli.lib $JPA_DESTINATION || true
    fi
 fi

http://git-wip-us.apache.org/repos/asf/james-project/blob/85f5c11a/dockerfiles/run/guice/cassandra/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/Dockerfile b/dockerfiles/run/guice/cassandra/Dockerfile
index 43b3485..78d58a8 100644
--- a/dockerfiles/run/guice/cassandra/Dockerfile
+++ b/dockerfiles/run/guice/cassandra/Dockerfile
@@ -19,10 +19,10 @@ EXPOSE 25 110 143 465 587 993 8000
 WORKDIR /root
 
 # Get data we need to run James : build results and configuration
-ADD destination/james-server-cassandra-guice-3.0.0-beta6-SNAPSHOT.jar /root/james-server.jar
-ADD destination/james-server-cassandra-guice-3.0.0-beta6-SNAPSHOT.lib /root/james-server-cassandra-guice-3.0.0-beta6-SNAPSHOT.lib
-ADD destination/james-server-cli-3.0.0-beta6-SNAPSHOT.jar /root/james-cli.jar
-ADD destination/james-server-cli-3.0.0-beta6-SNAPSHOT.lib /root/james-server-cli-3.0.0-beta6-SNAPSHOT.lib
+ADD destination/james-server-cassandra-guice.jar /root/james-server.jar
+ADD destination/james-server-cassandra-guice.lib /root/james-server-cassandra-guice.lib
+ADD destination/james-server-cli.jar /root/james-cli.jar
+ADD destination/james-server-cli.lib /root/james-server-cli.lib
 ADD destination/conf /root/conf
 
 VOLUME /logs

http://git-wip-us.apache.org/repos/asf/james-project/blob/85f5c11a/dockerfiles/run/guice/jpa/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/Dockerfile b/dockerfiles/run/guice/jpa/Dockerfile
index 6e93fc8..2fbe737 100644
--- a/dockerfiles/run/guice/jpa/Dockerfile
+++ b/dockerfiles/run/guice/jpa/Dockerfile
@@ -19,12 +19,12 @@ EXPOSE 25 110 143 465 587 993 8000
 WORKDIR /root
 
 # Get data we need to run James : build results and configuration
-ADD destination/james-server-jpa-guice-3.0.0-beta6-SNAPSHOT.jar /root/james-server.jar
-ADD destination/james-server-jpa-guice-3.0.0-beta6-SNAPSHOT.lib /root/james-server-jpa-guice-3.0.0-beta6-SNAPSHOT.lib
-ADD destination/james-server-cli-3.0.0-beta6-SNAPSHOT.jar /root/james-cli.jar
-ADD destination/james-server-cli-3.0.0-beta6-SNAPSHOT.lib /root/james-server-cli-3.0.0-beta6-SNAPSHOT.lib
+ADD destination/james-server-jpa-guice.jar /root/james-server.jar
+ADD destination/james-server-jpa-guice.lib /root/james-server-jpa-guice.lib
+ADD destination/james-server-cli.jar /root/james-cli.jar
+ADD destination/james-server-cli.lib /root/james-server-cli.lib
 ADD destination/conf /root/conf
 
 VOLUME /logs
 
-ENTRYPOINT java -javaagent:/root/james-server-cli-3.0.0-beta6-SNAPSHOT.lib/openjpa-2.2.1.jar
-Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ -jar james-server.jar
+ENTRYPOINT java -classpath '/root/james-server.jar:/root/james-server-jpa-guice.lib/*' -javaagent:/root/james-server-cli.lib/openjpa-2.2.1.jar
-Dlogback.configuratioile=/root/conf/logback.xml -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain

http://git-wip-us.apache.org/repos/asf/james-project/blob/85f5c11a/server/container/cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index 33a2d4e..c99dc9c 100644
--- a/server/container/cli/pom.xml
+++ b/server/container/cli/pom.xml
@@ -109,7 +109,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory>
+                            <outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -118,10 +118,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
+                    <finalName>${project.artifactId}</finalName>
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <classpathPrefix>${project.build.finalName}.lib/</classpathPrefix>
+                            <classpathPrefix>${project.artifactId}.lib/</classpathPrefix>
                             <mainClass>org.apache.james.cli.ServerCmd</mainClass>
                             <useUniqueVersions>false</useUniqueVersions>
                         </manifest>

http://git-wip-us.apache.org/repos/asf/james-project/blob/85f5c11a/server/container/guice/cassandra-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index 96dad5e..8474264 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -146,7 +146,7 @@
                             <goal>copy-dependencies</goal>
                           </goals>
                           <configuration>
-                            <outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory>
+                            <outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
                           </configuration>
                         </execution>
                       </executions>
@@ -161,10 +161,11 @@
                                   <goal>jar</goal>
                               </goals>
                               <configuration>
+                                  <finalName>${project.artifactId}</finalName>
                                   <archive>
                                       <manifest>
                                           <addClasspath>true</addClasspath>
-                                          <classpathPrefix>${project.build.finalName}.lib/</classpathPrefix>
+                                          <classpathPrefix>${project.artifactId}.lib/</classpathPrefix>
                                           <mainClass>org.apache.james.CassandraJamesServerMain</mainClass>
                                           <useUniqueVersions>false</useUniqueVersions>
                                       </manifest>

http://git-wip-us.apache.org/repos/asf/james-project/blob/85f5c11a/server/container/guice/jpa-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml
index a67a545..e9d1f62 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -147,7 +147,7 @@
                             <goal>copy-dependencies</goal>
                           </goals>
                           <configuration>
-                            <outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory>
+                            <outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
                           </configuration>
                         </execution>
                       </executions>
@@ -162,10 +162,11 @@
                                   <goal>jar</goal>
                               </goals>
                               <configuration>
+                                  <finalName>${project.artifactId}</finalName>
                                   <archive>
                                       <manifest>
                                           <addClasspath>true</addClasspath>
-                                          <classpathPrefix>${project.build.finalName}.lib/</classpathPrefix>
+                                          <classpathPrefix>${project.artifactId}.lib/</classpathPrefix>
                                           <mainClass>org.apache.james.JPAJamesServerMain</mainClass>
                                           <useUniqueVersions>false</useUniqueVersions>
                                       </manifest>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message