archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject [2/2] git commit: revert back compiler target/source to 1.6 see http://jira.codehaus.org/browse/MRM-1827
Date Fri, 11 Apr 2014 00:06:04 GMT
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 <olamy@apache.org>
Authored: Fri Apr 11 10:05:55 2014 +1000
Committer: Olivier Lamy <olamy@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;
     }


Mime
View raw message