maven cleanup

This commit is contained in:
eugenp 2013-05-31 22:56:25 +03:00
parent acd6f0432e
commit 6b0dd70f2b
8 changed files with 266 additions and 161 deletions

View File

@ -37,7 +37,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>4.2.2.Final</version>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@ -47,7 +47,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
<version>${mysql-connector-java.version}</version>
<scope>runtime</scope>
</dependency>
@ -56,7 +56,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>5.0.1.Final</version>
<version>${hibernate-validator.version}</version>
</dependency>
<!-- web -->
@ -80,7 +80,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
<version>${guava.version}</version>
</dependency>
<!-- test scoped -->
@ -128,6 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -141,6 +142,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
@ -166,10 +168,21 @@
<!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.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 -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
@ -181,6 +194,9 @@
<rest-assured.version>1.8.0</rest-assured.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>
</project>

View File

@ -32,7 +32,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.6.10.Final</version>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@ -42,7 +42,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
<version>${mysql-connector-java.version}</version>
<scope>runtime</scope>
</dependency>
@ -51,7 +51,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
<version>${guava.version}</version>
</dependency>
<!-- test scoped -->
@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
<version>${commons-lang3.version}</version>
<scope>test</scope>
</dependency>
@ -113,6 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -126,6 +127,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
@ -149,23 +151,37 @@
<properties>
<!-- Spring -->
<org.springframework.version>3.2.2.RELEASE</org.springframework.version>
<org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<!-- persistence -->
<hibernate.version>3.6.10.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.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 -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<httpcore.version>4.2.4</httpcore.version>
<httpclient.version>4.2.4</httpclient.version>
<httpclient.version>4.2.5</httpclient.version>
<rest-assured.version>1.8.0</rest-assured.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>
</project>

View File

@ -32,7 +32,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>4.2.2.Final</version>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@ -42,7 +42,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
<version>${mysql-connector-java.version}</version>
<scope>runtime</scope>
</dependency>
@ -51,7 +51,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>5.0.1.Final</version>
<version>${hibernate-validator.version}</version>
</dependency>
<!-- utils -->
@ -59,7 +59,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
<version>${guava.version}</version>
</dependency>
<!-- test scoped -->
@ -121,6 +121,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -134,6 +135,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
@ -159,10 +161,21 @@
<!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.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 -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
@ -174,6 +187,9 @@
<rest-assured.version>1.8.0</rest-assured.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>
</project>

View File

@ -1,11 +1,12 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.baeldung</groupId>
<artifactId>spring-jpa</artifactId>
<version>0.1-SNAPSHOT</version>
<name>spring-jpa</name>
<packaging>war</packaging>
<name>spring-jpa</name>
<dependencies>
@ -32,12 +33,12 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>4.2.1.Final</version>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>4.2.1.Final</version>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@ -47,7 +48,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
<version>${mysql-connector-java.version}</version>
<scope>runtime</scope>
</dependency>
@ -56,7 +57,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>5.0.1.Final</version>
<version>${hibernate-validator.version}</version>
</dependency>
<!-- utils -->
@ -64,7 +65,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
<version>${guava.version}</version>
</dependency>
<!-- test scoped -->
@ -72,7 +73,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
<version>${commons-lang3.version}</version>
<scope>test</scope>
</dependency>
@ -126,6 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -139,6 +141,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
@ -162,23 +165,37 @@
<properties>
<!-- Spring -->
<org.springframework.version>3.2.2.RELEASE</org.springframework.version>
<org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.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 -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<httpcore.version>4.2.4</httpcore.version>
<httpclient.version>4.2.4</httpclient.version>
<httpclient.version>4.2.5</httpclient.version>
<rest-assured.version>1.8.0</rest-assured.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>
</project>

View File

@ -83,6 +83,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -96,6 +97,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
@ -121,10 +123,21 @@
<!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.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 -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
@ -136,6 +149,9 @@
<rest-assured.version>1.8.0</rest-assured.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>
</project>

View File

@ -4,11 +4,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@ -17,7 +13,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@ -88,4 +83,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7

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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.baeldung</groupId>
<artifactId>spring-mvc</artifactId>
@ -84,6 +83,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -97,6 +97,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
@ -120,23 +121,37 @@
<properties>
<!-- Spring -->
<org.springframework.version>3.2.2.RELEASE</org.springframework.version>
<org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.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 -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<httpcore.version>4.2.4</httpcore.version>
<httpclient.version>4.2.4</httpclient.version>
<httpclient.version>4.2.5</httpclient.version>
<rest-assured.version>1.8.0</rest-assured.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>
</project>

View File

@ -141,6 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@ -154,6 +155,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
@ -178,12 +180,22 @@
<properties>
<!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.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 -->
<org.slf4j.version>1.7.5</org.slf4j.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 -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
@ -195,6 +207,9 @@
<rest-assured.version>1.8.0</rest-assured.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>
</project>