Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-377] Clean up poms

This commit is contained in:
Michael Bolz 2014-07-29 08:55:59 +02:00
parent c24054684c
commit ba3aa4ff69
3 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fit/pom.xml
View File

@ -81,14 +81,10 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>7.0.54</version>
<!--<version>8.0.9</version>-->
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>7.0.54</version>
<!--<version>8.0.9</version>-->
</dependency>
<dependency>
@ -173,8 +169,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includes>**/olingo/**/*.class</includes>
<excludes>**/*.properties</excludes>
<includeGroupIds>${project.groupId}</includeGroupIds>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>

9
lib/server-test/pom.xml
View File

@ -46,6 +46,10 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -80,8 +84,9 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includes>**/olingo/**/*.class</includes>
<excludes>**/*.properties</excludes>
<!--<includes>**/olingo/**/*.class</includes>-->
<!--<excludes>**/*.properties</excludes>-->
<includeGroupIds>${project.groupId}</includeGroupIds>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>

32
pom.xml
View File

@ -229,6 +229,17 @@
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>${tomcat.version}</version>
</dependency>
<!-- Pojogen Maven Plugin depenencies -->
<dependency>
<groupId>org.apache.velocity</groupId>
@ -345,11 +356,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>1.4.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@ -448,22 +454,6 @@
</delimiters>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<configuration>
<container>
<containerId>tomcat7x</containerId>
<zipUrlInstaller>
<url>http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
</container>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>