WEB-214: Fixed build failure while downloading javax.transaction dependency
Conflicts: .gitignore
This commit is contained in:
parent
efc047b030
commit
1f14aa7c9b
1
.gitignore
vendored
1
.gitignore
vendored
@ -28,6 +28,7 @@ src/main/webapp/users/*.jar
|
|||||||
src/main/webapp/plugin_lessons/*.jar
|
src/main/webapp/plugin_lessons/*.jar
|
||||||
src/main/webapp/users/*.props
|
src/main/webapp/users/*.props
|
||||||
classes/*
|
classes/*
|
||||||
|
*.iml
|
||||||
|
|
||||||
/*.iml
|
/*.iml
|
||||||
.extract/*
|
.extract/*
|
||||||
|
12
pom.xml
12
pom.xml
@ -7,14 +7,6 @@
|
|||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>6.1.0</version>
|
<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 -->
|
<!-- Shared version number properties -->
|
||||||
<properties>
|
<properties>
|
||||||
<org.springframework.version>3.2.4.RELEASE</org.springframework.version>
|
<org.springframework.version>3.2.4.RELEASE</org.springframework.version>
|
||||||
@ -252,8 +244,8 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.transaction</groupId>
|
<groupId>javax.transaction</groupId>
|
||||||
<artifactId>jta</artifactId>
|
<artifactId>javax.transaction-api</artifactId>
|
||||||
<version>1.0.1B</version>
|
<version>1.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.sourceforge.jtds</groupId>
|
<groupId>net.sourceforge.jtds</groupId>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user