WEB-214: Fixed build failure while downloading javax.transaction dependency

Conflicts:
	.gitignore
This commit is contained in:
Nanne Baars 2015-07-12 12:16:59 +02:00
parent efc047b030
commit 1f14aa7c9b
2 changed files with 3 additions and 10 deletions

1
.gitignore vendored
View File

@ -28,6 +28,7 @@ src/main/webapp/users/*.jar
src/main/webapp/plugin_lessons/*.jar
src/main/webapp/users/*.props
classes/*
*.iml
/*.iml
.extract/*

12
pom.xml
View File

@ -7,14 +7,6 @@
<packaging>war</packaging>
<version>6.1.0</version>
<repositories>
<repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Maven 2 Repository</name>
<url>http://download.java.net/maven/2</url>
</repository>
</repositories>
<!-- Shared version number properties -->
<properties>
<org.springframework.version>3.2.4.RELEASE</org.springframework.version>
@ -252,8 +244,8 @@
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.0.1B</version>
<artifactId>javax.transaction-api</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>