From 1f14aa7c9b3a29df137a1156e3c9db17bfbbdef8 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nbaars@xebia.com>
Date: Sun, 12 Jul 2015 12:16:59 +0200
Subject: [PATCH] WEB-214: Fixed build failure while downloading
 javax.transaction dependency

Conflicts:
	.gitignore
---
 .gitignore |  1 +
 pom.xml    | 12 ++----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 738bebaca..35def3a69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ src/main/webapp/users/*.jar
 src/main/webapp/plugin_lessons/*.jar
 src/main/webapp/users/*.props
 classes/*
+*.iml
 
 /*.iml
 .extract/*
diff --git a/pom.xml b/pom.xml
index 8b19911bb..8cbfd57a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>