From 6853f30c9e0a351c49b2a36884bc67b0911271d6 Mon Sep 17 00:00:00 2001 From: KevinDion Date: Wed, 6 Mar 2013 04:29:50 -0500 Subject: [PATCH] Configuration des pom de maven avec un master pom --- acceptanceTests/pom.xml | 67 ++----- centralServer/glo4002Checker.xml | 188 ------------------ centralServer/pom.xml | 72 ++----- client/glo4002Checker.xml | 188 ------------------ client/pom.xml | 42 +--- common/pom.xml | 40 +--- .../requestSender/GETRequestSender.java | 2 +- emergencyServer/glo4002Checker.xml | 188 ------------------ emergencyServer/pom.xml | 42 ++-- .../glo4002Checker.xml => glo4002Checker.xml | 0 ...o4002Formatter.xml => glo4002Formatter.xml | 0 pom.xml | 93 +++++++++ 12 files changed, 162 insertions(+), 760 deletions(-) delete mode 100644 centralServer/glo4002Checker.xml delete mode 100644 client/glo4002Checker.xml delete mode 100644 emergencyServer/glo4002Checker.xml rename acceptanceTests/glo4002Checker.xml => glo4002Checker.xml (100%) rename centralServer/glo4002Formatter.xml => glo4002Formatter.xml (100%) create mode 100644 pom.xml diff --git a/acceptanceTests/pom.xml b/acceptanceTests/pom.xml index fc441df..4a6eace 100644 --- a/acceptanceTests/pom.xml +++ b/acceptanceTests/pom.xml @@ -1,85 +1,52 @@ + + ca.ulaval.glo4002 + glo4002 + 0.0.1-SNAPSHOT + 4.0.0 - ca.ulaval.glo4002.acceptanceTests acceptanceTests - 0.0.1-SNAPSHOT - - - UTF-8 - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.10 + maven-surefire-plugin - glo4002Checker.xml - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - java - - - - - ca.ulaval.glo4002.acceptanceTests.acceptanceTests + ${basedir}/src/main/java/ + ${project.build.directory}/classes/ + junit junit - 4.8.1 - test - ca.ulaval.glo4002.central.server + org.mockito + mockito-all + + + ca.ulaval.glo4002 centralServer - 0.0.1-SNAPSHOT - test - ca.ulaval.glo4002.emergency.server + ca.ulaval.glo4002 emergencyServer - 0.0.1-SNAPSHOT - test - ca.ulaval.glo4002.client + ca.ulaval.glo4002 client - 0.0.1-SNAPSHOT - test - - - org.mockito - mockito-all - 1.9.5 com.jayway.awaitility awaitility 1.3.5 - test - + \ No newline at end of file diff --git a/centralServer/glo4002Checker.xml b/centralServer/glo4002Checker.xml deleted file mode 100644 index 1022efe..0000000 --- a/centralServer/glo4002Checker.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/centralServer/pom.xml b/centralServer/pom.xml index 8af8d61..34aea9b 100644 --- a/centralServer/pom.xml +++ b/centralServer/pom.xml @@ -1,27 +1,15 @@ + + ca.ulaval.glo4002 + glo4002 + 0.0.1-SNAPSHOT + 4.0.0 - ca.ulaval.glo4002.central.server centralServer - 0.0.1-SNAPSHOT + - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.10 - - glo4002Checker.xml - - org.codehaus.mojo exec-maven-plugin @@ -37,63 +25,29 @@ ca.ulaval.glo4002.centralServer.main.Main - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - jar-with-dependencies - - - - ca.ulaval.glo4002.centralServer.main.Main - - - - - - package - - single - - - - + - - com.sun.jersey - jersey-servlet - 1.17 - - - org.eclipse.jetty - jetty-servlet - 8.1.0.RC2 - junit junit - 4.8.1 - test org.mockito mockito-all - 1.9.5 + + + org.eclipse.jetty + jetty-servlet com.sun.jersey - jersey-client - 1.17 + jersey-servlet - ca.ulaval.glo4002.common + ca.ulaval.glo4002 common - 0.0.1-SNAPSHOT - compile diff --git a/client/glo4002Checker.xml b/client/glo4002Checker.xml deleted file mode 100644 index 1022efe..0000000 --- a/client/glo4002Checker.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/pom.xml b/client/pom.xml index 6ed4ea2..2b57900 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -1,55 +1,35 @@ + + ca.ulaval.glo4002 + glo4002 + 0.0.1-SNAPSHOT + 4.0.0 - ca.ulaval.glo4002.client client - 0.0.1-SNAPSHOT - - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.10 - - glo4002Checker.xml - - - - + junit junit - 4.8.1 - test org.mockito mockito-all - 1.9.5 com.sun.jersey jersey-client - 1.17 + + + ca.ulaval.glo4002 + common com.googlecode.json-simple json-simple 1.1 - - ca.ulaval.glo4002.common - common - 0.0.1-SNAPSHOT - + \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index cdb3656..23ffc02 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,44 +1,26 @@ + + ca.ulaval.glo4002 + glo4002 + 0.0.1-SNAPSHOT + 4.0.0 - ca.ulaval.glo4002.common common - 0.0.1-SNAPSHOT - - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.10 - - glo4002Checker.xml - - - - + - - org.mockito - mockito-all - 1.9.5 - junit junit - 4.11 + + + org.mockito + mockito-all com.sun.jersey jersey-client - 1.17 + \ No newline at end of file diff --git a/common/src/main/java/ca/ulaval/glo4002/common/requestSender/GETRequestSender.java b/common/src/main/java/ca/ulaval/glo4002/common/requestSender/GETRequestSender.java index 349fecc..a1721ec 100644 --- a/common/src/main/java/ca/ulaval/glo4002/common/requestSender/GETRequestSender.java +++ b/common/src/main/java/ca/ulaval/glo4002/common/requestSender/GETRequestSender.java @@ -5,7 +5,7 @@ import com.sun.jersey.api.client.WebResource; public class GETRequestSender extends HTTPRequestSender { - + public GETRequestSender(int port) { super(port); } diff --git a/emergencyServer/glo4002Checker.xml b/emergencyServer/glo4002Checker.xml deleted file mode 100644 index 1022efe..0000000 --- a/emergencyServer/glo4002Checker.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/emergencyServer/pom.xml b/emergencyServer/pom.xml index 8c8d5a2..3c01171 100644 --- a/emergencyServer/pom.xml +++ b/emergencyServer/pom.xml @@ -1,27 +1,15 @@ + + ca.ulaval.glo4002 + glo4002 + 0.0.1-SNAPSHOT + 4.0.0 - ca.ulaval.glo4002.emergency.server emergencyServer - 0.0.1-SNAPSHOT + - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.10 - - glo4002Checker.xml - - org.codehaus.mojo exec-maven-plugin @@ -39,22 +27,24 @@ + + + junit + junit + + + org.mockito + mockito-all + org.eclipse.jetty jetty-servlet - 8.1.0.RC2 com.sun.jersey jersey-servlet - 1.17 - - - junit - junit - 4.8.1 - test + \ No newline at end of file diff --git a/acceptanceTests/glo4002Checker.xml b/glo4002Checker.xml similarity index 100% rename from acceptanceTests/glo4002Checker.xml rename to glo4002Checker.xml diff --git a/centralServer/glo4002Formatter.xml b/glo4002Formatter.xml similarity index 100% rename from centralServer/glo4002Formatter.xml rename to glo4002Formatter.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..edb4e9d --- /dev/null +++ b/pom.xml @@ -0,0 +1,93 @@ + + 4.0.0 + ca.ulaval.glo4002 + glo4002 + 0.0.1-SNAPSHOT + pom + + + UTF-8 + + + + + + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.10 + + glo4002Checker.xml + + + + + + + + + ca.ulaval.glo4002 + centralServer + 0.0.1-SNAPSHOT + + + ca.ulaval.glo4002 + emergencyServer + 0.0.1-SNAPSHOT + + + ca.ulaval.glo4002 + client + 0.0.1-SNAPSHOT + + + ca.ulaval.glo4002 + common + 0.0.1-SNAPSHOT + + + junit + junit + 4.8.1 + + + org.mockito + mockito-all + 1.9.5 + test + + + org.eclipse.jetty + jetty-servlet + 8.1.0.RC2 + + + com.sun.jersey + jersey-servlet + 1.17 + + + com.sun.jersey + jersey-client + 1.17 + + + + + + acceptanceTests + centralServer + client + common + emergencyServer + + + \ No newline at end of file