git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dependencies now in root pom
[utils]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index f9bc751dec8b68fa7da86a2568c26ee4a676315c..a41a601aa41f7caa2fd8fb67a2cd8e8df875f0dd 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-1,5
+1,7
@@
<?xml version="1.0"?>
<?xml version="1.0"?>
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-utils</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-utils</artifactId>
@@
-80,7
+82,7
@@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.
0
</version>
+ <version>1.8.
5
</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
@@
-96,6
+98,13
@@
<dependencyManagement>
<dependencies>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
+ <version>1.0.1-Final</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
@@
-236,12
+245,6
@@
<version>${spring.version}</version>
</dependency>
<version>${spring.version}</version>
</dependency>
- <!-- should be possible to remove the dependence on log4j -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
@@
-436,7
+439,7
@@
</plugins>
</plugins>
-
+
<pluginManagement>
<plugins>
<plugin>
<pluginManagement>
<plugins>
<plugin>
@@
-447,7
+450,7
@@
</pluginManagement>
</build>
</pluginManagement>
</build>
-
+
<reporting>
<plugins>
<reporting>
<plugins>