iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor maven upgrades and cleanup

This commit is contained in:
eugenp 2013-07-04 12:49:12 +03:00
parent 270bd5b707
commit cb6253a2a5
2 changed files with 168 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

323
spring-hibernate3/pom.xml
View File

@ -1,188 +1,197 @@
<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"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.baeldung</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>spring-hibernate3</artifactId> <groupId>org.baeldung</groupId>
<version>0.1-SNAPSHOT</version> <artifactId>spring-hibernate3</artifactId>
<version>0.1-SNAPSHOT</version>
<name>spring-hibernate3</name> <name>spring-hibernate3</name>
<packaging>war</packaging> <packaging>war</packaging>
<dependencies> <dependencies>
<!-- Spring --> <!-- Spring -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId> <artifactId>spring-orm</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<!-- persistence --> <!-- persistence -->
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version> <version>${hibernate.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.javassist</groupId> <groupId>org.javassist</groupId>
<artifactId>javassist</artifactId> <artifactId>javassist</artifactId>
<version>3.17.1-GA</version> <version>${javassist.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java.version}</version> <version>${mysql-connector-java.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
<version>${tomcat-dbcp.version}</version>
</dependency>
<!-- utils -->
<!-- utils --> <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency> <!-- test scoped -->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<!-- test scoped --> <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.springframework</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>spring-test</artifactId>
<version>${commons-lang3.version}</version> <version>${org.springframework.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>junit</groupId>
<artifactId>spring-test</artifactId> <artifactId>junit-dep</artifactId>
<version>${org.springframework.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.hamcrest</groupId>
<artifactId>junit-dep</artifactId> <artifactId>hamcrest-core</artifactId>
<version>${junit.version}</version> <version>${org.hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${org.hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.mockito</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>mockito-core</artifactId>
<version>${org.hamcrest.version}</version> <version>${mockito.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${org.hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency> </dependencies>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies> <build>
<finalName>spring-hibernate3</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<build> <plugins>
<finalName>spring-hibernate3</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
</excludes>
<systemPropertyVariables>
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
</systemPropertyVariables>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>cargo-maven2-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version> <version>${cargo-maven2-plugin.version}</version>
<configuration> <configuration>
<excludes> <wait>true</wait>
<!-- <exclude>**/*ProductionTest.java</exclude> --> <container>
</excludes> <containerId>jetty8x</containerId>
<systemPropertyVariables> <type>embedded</type>
<!-- <provPersistenceTarget>h2</provPersistenceTarget> --> <systemProperties>
</systemPropertyVariables> <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
</configuration> </systemProperties>
</plugin> </container>
<configuration>
<properties>
<cargo.servlet.port>8082</cargo.servlet.port>
</properties>
</configuration>
</configuration>
</plugin>
<plugin> </plugins>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
<containerId>jetty8x</containerId>
<type>embedded</type>
<systemProperties>
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
</systemProperties>
</container>
<configuration>
<properties>
<cargo.servlet.port>8082</cargo.servlet.port>
</properties>
</configuration>
</configuration>
</plugin>
</plugins> </build>
</build> <properties>
<!-- Spring -->
<org.springframework.version>3.2.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<javassist.version>3.18.0-GA</javassist.version>
<properties> <!-- persistence -->
<!-- Spring --> <hibernate.version>3.6.10.Final</hibernate.version>
<org.springframework.version>3.2.3.RELEASE</org.springframework.version> <mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version> <tomcat-dbcp.version>7.0.41</tomcat-dbcp.version>
<!-- persistence --> <!-- logging -->
<hibernate.version>3.6.10.Final</hibernate.version> <org.slf4j.version>1.7.5</org.slf4j.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version> <logback.version>1.0.11</logback.version>
<!-- logging --> <!-- various -->
<org.slf4j.version>1.7.5</org.slf4j.version> <hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<logback.version>1.0.11</logback.version>
<!-- various --> <!-- util -->
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version> <guava.version>14.0.1</guava.version>
<commons-lang3.version>3.1</commons-lang3.version>
<!-- util --> <!-- testing -->
<guava.version>14.0.1</guava.version> <org.hamcrest.version>1.3</org.hamcrest.version>
<commons-lang3.version>3.1</commons-lang3.version> <junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<!-- testing --> <httpcore.version>4.2.4</httpcore.version>
<org.hamcrest.version>1.3</org.hamcrest.version> <httpclient.version>4.2.5</httpclient.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<httpcore.version>4.2.4</httpcore.version> <rest-assured.version>1.8.1</rest-assured.version>
<httpclient.version>4.2.5</httpclient.version> <groovy.version>1.8.9</groovy.version>
<rest-assured.version>1.8.0</rest-assured.version> <!-- Maven plugins -->
<groovy.version>1.8.9</groovy.version> <cargo-maven2-plugin.version>1.4.2</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
<!-- Maven plugins --> </properties>
<cargo-maven2-plugin.version>1.4.2</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.14.1</maven-surefire-plugin.version>
</properties>
</project> </project>

3
spring-hibernate4/pom.xml
View File

@ -50,7 +50,7 @@
<dependency> <dependency>
<groupId>org.apache.tomcat</groupId> <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId> <artifactId>tomcat-dbcp</artifactId>
<version>7.0.41</version> <version>${tomcat-dbcp.version}</version>
</dependency> </dependency>
<!-- validation --> <!-- validation -->
@ -173,6 +173,7 @@
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.2.2.Final</hibernate.version> <hibernate.version>4.2.2.Final</hibernate.version>
<mysql-connector-java.version>5.1.25</mysql-connector-java.version> <mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<tomcat-dbcp.version>7.0.41</tomcat-dbcp.version>
<!-- logging --> <!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.version> <org.slf4j.version>1.7.5</org.slf4j.version>