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

maven cleanup

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-all/pom.xml
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>

1
spring-hibernate3/pom.xml
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>

1
spring-hibernate4/pom.xml
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>

1
spring-jpa/pom.xml
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>

1
spring-mvc-java/pom.xml
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>

1
spring-mvc/pom.xml
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>

46
spring-security-login/pom.xml
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>
@ -168,25 +170,39 @@
</build> </build>
<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> <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- logging --> <!-- persistence -->
<org.slf4j.version>1.7.5</org.slf4j.version> <hibernate.version>4.2.2.Final</hibernate.version>
<logback.version>1.0.11</logback.version> <mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- testing --> <!-- logging -->
<org.hamcrest.version>1.3</org.hamcrest.version> <org.slf4j.version>1.7.5</org.slf4j.version>
<junit.version>4.11</junit.version> <logback.version>1.0.11</logback.version>
<mockito.version>1.9.5</mockito.version>
<httpcore.version>4.2.4</httpcore.version> <!-- various -->
<httpclient.version>4.2.5</httpclient.version> <hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<rest-assured.version>1.8.0</rest-assured.version> <!-- util -->
<groovy.version>1.8.9</groovy.version> <guava.version>14.0.1</guava.version>
<commons-lang3.version>3.1</commons-lang3.version>
</properties> <!-- 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.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> </project>

353
spring-security-rest/pom.xml
View File

@ -1,200 +1,215 @@
<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> <version>0.1-SNAPSHOT</version>
<version>0.1-SNAPSHOT</version>
<name>spring-security-rest</name> <name>spring-security-rest</name>
<packaging>war</packaging> <packaging>war</packaging>
<dependencies> <dependencies>
<!-- Spring Security --> <!-- Spring Security -->
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId> <artifactId>spring-security-web</artifactId>
<version>${org.springframework.security.version}</version> <version>${org.springframework.security.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId> <artifactId>spring-security-config</artifactId>
<version>${org.springframework.security.version}</version> <version>${org.springframework.security.version}</version>
</dependency> </dependency>
<!-- Spring --> <!-- Spring -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-core</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>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId> <artifactId>spring-jdbc</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-beans</artifactId> <artifactId>spring-beans</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-aop</artifactId> <artifactId>spring-aop</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-tx</artifactId> <artifactId>spring-tx</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-expression</artifactId> <artifactId>spring-expression</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-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-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<!-- web --> <!-- web -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>1.2</version> <version>1.2</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!-- util --> <!-- util -->
<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 -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit-dep</artifactId> <artifactId>junit-dep</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest-core</artifactId>
<version>${org.hamcrest.version}</version> <version>${org.hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest-library</artifactId>
<version>${org.hamcrest.version}</version> <version>${org.hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version> <version>${mockito.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>spring-security-rest</finalName> <finalName>spring-security-rest</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <version>${maven-surefire-plugin.version}</version>
<excludes> <configuration>
<!-- <exclude>**/*ProductionTest.java</exclude> --> <excludes>
</excludes> <!-- <exclude>**/*ProductionTest.java</exclude> -->
<systemPropertyVariables> </excludes>
<!-- <provPersistenceTarget>h2</provPersistenceTarget> --> <systemPropertyVariables>
</systemPropertyVariables> <!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
</configuration> </systemPropertyVariables>
</plugin> </configuration>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId> <artifactId>cargo-maven2-plugin</artifactId>
<configuration> <version>${cargo-maven2-plugin.version}</version>
<wait>true</wait> <configuration>
<container> <wait>true</wait>
<containerId>jetty8x</containerId> <container>
<type>embedded</type> <containerId>jetty8x</containerId>
<systemProperties> <type>embedded</type>
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> --> <systemProperties>
</systemProperties> <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
</container> </systemProperties>
<configuration> </container>
<properties> <configuration>
<cargo.servlet.port>8082</cargo.servlet.port> <properties>
</properties> <cargo.servlet.port>8082</cargo.servlet.port>
</configuration> </properties>
</configuration> </configuration>
</plugin> </configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<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> <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- logging --> <!-- persistence -->
<org.slf4j.version>1.7.5</org.slf4j.version> <hibernate.version>4.2.2.Final</hibernate.version>
<logback.version>1.0.11</logback.version> <mysql-connector-java.version>5.1.25</mysql-connector-java.version>
<!-- testing --> <!-- logging -->
<org.hamcrest.version>1.3</org.hamcrest.version> <org.slf4j.version>1.7.5</org.slf4j.version>
<junit.version>4.11</junit.version> <logback.version>1.0.11</logback.version>
<mockito.version>1.9.5</mockito.version>
<httpcore.version>4.2.4</httpcore.version> <!-- various -->
<httpclient.version>4.2.5</httpclient.version> <hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<rest-assured.version>1.8.0</rest-assured.version> <!-- util -->
<groovy.version>1.8.9</groovy.version> <guava.version>14.0.1</guava.version>
<commons-lang3.version>3.1</commons-lang3.version>
</properties> <!-- 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.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> </project>