Mercurial > lada > lada-server
changeset 430:5fe37b00ed41
Updated dependencies and profiles.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Fri, 06 Feb 2015 12:20:10 +0100 |
| parents | 11c6e8dee811 |
| children | 83b92b475d9d |
| files | pom.xml |
| diffstat | 1 files changed, 72 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- a/pom.xml Wed Feb 04 16:16:27 2015 +0100 +++ b/pom.xml Fri Feb 06 12:20:10 2015 +0100 @@ -18,37 +18,21 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <!-- JBoss dependency versions --> - <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin> - <version.jboss.bom>8.2.1.Final</version.jboss.bom> - <version.wildfly>8.2.Final</version.wildfly> - <version.arquillian.container>8.0.0.Final</version.arquillian.container> - <!-- other plugin versions --> - <version.compiler.plugin>3.1</version.compiler.plugin> - <version.ear.plugin>2.6</version.ear.plugin> - <version.ejb.plugin>2.3</version.ejb.plugin> - <version.surefire.plugin>2.16</version.surefire.plugin> - <version.war.plugin>2.5</version.war.plugin> - <!-- maven-compiler-plugin --> - <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.source>1.7</maven.compiler.source> </properties> - <dependencyManagement> <dependencies> <dependency> <groupId>org.wildfly.bom</groupId> <artifactId>jboss-javaee-7.0-with-tools</artifactId> - <version>${version.jboss.bom}</version> + <version>8.2.1.Final</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.wildfly.bom</groupId> <artifactId>jboss-javaee-7.0-with-hibernate</artifactId> - <version>${version.jboss.bom}</version> + <version>8.2.1.Final</version> <type>pom</type> <scope>import</scope> </dependency> @@ -56,45 +40,31 @@ </dependencyManagement> <dependencies> + <!-- JavaEE and JBoss/Wildfly --> <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.spec.javax.annotation</groupId> - <artifactId>jboss-annotations-api_1.2_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> <version>1.1.1</version> </dependency> <dependency> - <groupId>org.jboss.spec.javax.json</groupId> - <artifactId>jboss-json-api_1.0_spec</artifactId> - <version>1.0.0.Final</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - </dependency> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.1-api</artifactId> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.2_spec</artifactId> <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.spec.javax.json</groupId> + <artifactId>jboss-json-api_1.0_spec</artifactId> + </dependency> + + <!-- Hibernate --> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>4.3.7.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.2_spec</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -122,37 +92,42 @@ <artifactId>hibernate-core</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-spatial</artifactId> <version>4.3</version> </dependency> + + <!-- Arquillian/Testing --> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.0.1</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + <version>1.0.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-client</artifactId> + <version>3.0.10.Final</version> + <scope>test</scope> </dependency> </dependencies> - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - </configuration> - </plugin> - <plugin> - <groupId>org.wildfly.plugins</groupId> - <artifactId>wildfly-maven-plugin</artifactId> - <version>1.0.2.Final</version> - </plugin> - </plugins> - </build> - <profiles> <profile> <id>default</id> @@ -160,11 +135,43 @@ <activeByDefault>true</activeByDefault> </activation> <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> </build> </profile> <profile> - <id>remote</id> + <id>remote-test</id> + <dependencies> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-arquillian-container-remote</artifactId> + <version>8.2.0.Final</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <profile> + <id>managed-test</id> + <dependencies> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-arquillian-container-remote</artifactId> + <version>8.2.0.Final</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <profile> + <id>remote-deploy</id> <build> <plugins> <plugin> @@ -190,6 +197,7 @@ </build> </profile> </profiles> + <repositories> <repository> <id>OSGEO GeoTools repo</id>