You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/11 02:06:03 UTC
[1/2] git commit: upgrade junit
Repository: archiva-redback-core
Updated Branches:
refs/heads/master 28bde8164 -> 34daedb55
upgrade junit
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/41979d0d
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/41979d0d
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/41979d0d
Branch: refs/heads/master
Commit: 41979d0ddb30d17041c597c1e6a3f50bc60f5fc6
Parents: 28bde81
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 10 16:30:04 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 10 16:30:04 2014 +1000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/41979d0d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5905b74..221b382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -653,7 +653,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
[2/2] git commit: revert back compiler target/source to 1.6 see
http://jira.codehaus.org/browse/MRM-1827
Posted by ol...@apache.org.
revert back compiler target/source to 1.6 see http://jira.codehaus.org/browse/MRM-1827
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/34daedb5
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/34daedb5
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/34daedb5
Branch: refs/heads/master
Commit: 34daedb551fdfcb5cf3dc51ca1c79c4eb4d374b0
Parents: 41979d0
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Apr 11 10:05:55 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Apr 11 10:05:55 2014 +1000
----------------------------------------------------------------------
pom.xml | 10 ++++++++++
.../redback/authentication/AuthenticationResult.java | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/34daedb5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 221b382..86f3d23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -671,6 +671,16 @@
<build>
<pluginManagement>
<plugins>
+ <!-- due to issue with bcel using 1.7 as target doesn't work -->
+ <!-- http://jira.codehaus.org/browse/MRM-1827 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jpox-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/34daedb5/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java
index 8424ec5..dd98d56 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java
@@ -96,7 +96,7 @@ public class AuthenticationResult
{
if ( authenticationFailureCauses == null )
{
- this.authenticationFailureCauses = new ArrayList<>();
+ this.authenticationFailureCauses = new ArrayList<AuthenticationFailureCause>();
}
return authenticationFailureCauses;
}