Start adapting Aether

git-svn-id: https://svn.argeo.org/slc/trunk@7919 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java b/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java
index 069e4c3e4ee055952d61e1a09662adc331183f4a..eddcea720fb64a4536e9c27ec679d31c10f47346 100644 (file)
--- a/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java
+++ b/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java
@@ -15,7 +15,6 @@
  */
 package org.argeo.slc.aether.spring;
 
-import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.FactoryBean;
@@ -30,14 +29,14 @@ public class RemoteRepositoryFactory implements BeanNameAware, FactoryBean {
        private String password;
 
        public Object getObject() throws Exception {
+               RemoteRepository remoteRepository = new RemoteRepository.Builder(
+                               id != null ? id : beanName, type, url).build();
                // FIXME Adapt to changes in Aether
-//             RemoteRepository remoteRepository = new RemoteRepository(
-//                             id != null ? id : beanName, type, url);
-//             if (username != null) {
-//                     Authentication authentication = new Authentication(username,
-//                                     password);
-//                     remoteRepository.setAuthentication(authentication);
-//             }
+               // if (username != null) {
+               // Authentication authentication = new Authentication(username,
+               // password);
+               // remoteRepository.setAuthentication(authentication);
+               // }
                return null;
        }