Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Recent Usermanager impl and api split broke Web UI. Fixing it here."
[controller.git]
/
opendaylight
/
commons
/
opendaylight
/
pom.xml
diff --git
a/opendaylight/commons/opendaylight/pom.xml
b/opendaylight/commons/opendaylight/pom.xml
index 4062e1839b5a112ab16fed674e1c03b6c47efebb..c3c9a5cd1ee719679ad6eab99f19427797d02ded 100644
(file)
--- a/
opendaylight/commons/opendaylight/pom.xml
+++ b/
opendaylight/commons/opendaylight/pom.xml
@@
-24,7
+24,8
@@
<projectinfo>2.6</projectinfo>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler.version>2.3.2</compiler.version>
<projectinfo>2.6</projectinfo>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler.version>2.3.2</compiler.version>
- <surefire.version>2.13</surefire.version>
+ <surefire.version>2.15</surefire.version>
+ <failsafe.version>2.15</failsafe.version>
<exam.version>3.0.0</exam.version>
<url.version>1.5.0</url.version>
<enunciate.version>1.26.2</enunciate.version>
<exam.version>3.0.0</exam.version>
<url.version>1.5.0</url.version>
<enunciate.version>1.26.2</enunciate.version>
@@
-303,21
+304,27
@@
<configLocation>${project.parent.basedir}/space_and_tabs_checks.xml</configLocation>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<configLocation>${project.parent.basedir}/space_and_tabs_checks.xml</configLocation>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <sourceDirectory>${project.basedir}</sourceDirectory>
+ <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>
2.14.1
</version>
+ <version>
${failsafe.version}
</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
- <goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</goals>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
</plugins>
<pluginManagement>
<plugins>