maven cleanup

This commit is contained in:
eugenp 2013-05-31 23:01:42 +03:00
parent f2496eec8b
commit 34f2bc6a83
8 changed files with 221 additions and 184 deletions

View File

@ -167,6 +167,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version> <hibernate.version>4.2.2.Final</hibernate.version>

View File

@ -152,6 +152,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->
<hibernate.version>3.6.10.Final</hibernate.version> <hibernate.version>3.6.10.Final</hibernate.version>

View File

@ -160,6 +160,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version> <hibernate.version>4.2.2.Final</hibernate.version>

View File

@ -166,6 +166,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version> <hibernate.version>4.2.2.Final</hibernate.version>

View File

@ -122,6 +122,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version> <hibernate.version>4.2.2.Final</hibernate.version>

View File

@ -122,6 +122,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version> <hibernate.version>4.2.2.Final</hibernate.version>

View File

@ -133,6 +133,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration> <configuration>
<excludes> <excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> --> <!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -146,6 +147,7 @@
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId> <artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration> <configuration>
<wait>true</wait> <wait>true</wait>
<container> <container>
@ -172,10 +174,21 @@
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version> <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- logging --> <!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.version> <org.slf4j.version>1.7.5</org.slf4j.version>
<logback.version>1.0.11</logback.version> <logback.version>1.0.11</logback.version>
<!-- various -->
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<!-- util -->
<guava.version>14.0.1</guava.version>
<commons-lang3.version>3.1</commons-lang3.version>
<!-- testing --> <!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version> <org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
@ -187,6 +200,9 @@
<rest-assured.version>1.8.0</rest-assured.version> <rest-assured.version>1.8.0</rest-assured.version>
<groovy.version>1.8.9</groovy.version> <groovy.version>1.8.9</groovy.version>
<!-- Maven plugins -->
<cargo-maven2-plugin.version>1.4.2</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.14.1</maven-surefire-plugin.version>
</properties> </properties>
</project> </project>

View File

@ -1,5 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.baeldung</groupId> <groupId>org.baeldung</groupId>
<artifactId>spring-security-rest</artifactId> <artifactId>spring-security-rest</artifactId>
@ -93,7 +92,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>14.0.1</version> <version>${guava.version}</version>
</dependency> </dependency>
<!-- test scoped --> <!-- test scoped -->
@ -141,6 +140,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration> <configuration>
<excludes> <excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> --> <!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -154,6 +154,7 @@
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId> <artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration> <configuration>
<wait>true</wait> <wait>true</wait>
<container> <container>
@ -180,10 +181,21 @@
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version> <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- logging --> <!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.version> <org.slf4j.version>1.7.5</org.slf4j.version>
<logback.version>1.0.11</logback.version> <logback.version>1.0.11</logback.version>
<!-- various -->
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<!-- util -->
<guava.version>14.0.1</guava.version>
<commons-lang3.version>3.1</commons-lang3.version>
<!-- testing --> <!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version> <org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
@ -195,6 +207,9 @@
<rest-assured.version>1.8.0</rest-assured.version> <rest-assured.version>1.8.0</rest-assured.version>
<groovy.version>1.8.9</groovy.version> <groovy.version>1.8.9</groovy.version>
<!-- Maven plugins -->
<cargo-maven2-plugin.version>1.4.2</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.14.1</maven-surefire-plugin.version>
</properties> </properties>
</project> </project>