This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit b874da8d6995700086033c58b2413a21fe2a088d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 20 18:33:52 2015 +0100 refs #1197 fix some dependencies --- lima-callao/pom.xml | 19 ------------------- lima-server/pom.xml | 13 ++++++++++++- lima-swing/pom.xml | 5 ----- pom.xml | 15 +++++++++++++++ 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index d9a8bd4..66b5d99 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -83,25 +83,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>com.thoughtworks.paranamer</groupId> - <artifactId>paranamer-maven-plugin</artifactId> - <executions> - <execution> - <id>run</id> <!-- id is optional --> - <configuration> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <!-- if some of parameter names you need to retain are held in pre-existing jars, they need to be added to the classpath --> - </dependencies> - </plugin> </plugins> </build> diff --git a/lima-server/pom.xml b/lima-server/pom.xml index 59b9eae..7044a05 100644 --- a/lima-server/pom.xml +++ b/lima-server/pom.xml @@ -103,7 +103,6 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <!--<scope>provided</scope>--> </dependency> <dependency> @@ -209,6 +208,18 @@ </configuration> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <!-- FIXME Find out why ? tchemit-2014-03-20 --> + <!-- ignore annotations for "unused but declared" warnings --> + <ignoredUnusedDeclaredDependencies> + <ignoredUnusedDeclaredDependency>javax.servlet:javax.servlet-api</ignoredUnusedDeclaredDependency> + </ignoredUnusedDeclaredDependencies> + </configuration> + </plugin> + </plugins> </pluginManagement> <plugins> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 598438a..89fb5d6 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -149,11 +149,6 @@ <artifactId>commons-io</artifactId> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <!-- for remote mode only --> <dependency> <groupId>org.apache.openejb</groupId> diff --git a/pom.xml b/pom.xml index 179797c..08bf46b 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,9 @@ <!-- Site configuration --> <locales>fr</locales> + <!-- FIXME Remove this when using chorempom 1.8.2 --> + <dependencyPluginVersion>2.10</dependencyPluginVersion> + </properties> <repositories> @@ -505,12 +508,24 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> <version>${jettyPluginVersion}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jettyPluginVersion}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.