From 40fb326ca1e1e45f95e3a89c23fc3d07177da20d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 13 Feb 2015 15:33:58 +0000 Subject: [PATCH] SLC Repo building git-svn-id: https://svn.argeo.org/slc/trunk@7844 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dep/org.argeo.slc.dep.backend/bnd.bnd | 0 dep/org.argeo.slc.dep.backend/pom.xml | 49 +++---- dep/org.argeo.slc.dep.minimal/bnd.bnd | 0 dep/org.argeo.slc.dep.minimal/pom.xml | 132 ++++-------------- dep/pom.xml | 7 +- org.argeo.slc.core/bin/log4j.properties | 22 --- .../argeo/slc/repo/ArtifactDistribution.java | 4 +- .../org/argeo/slc/repo/ArtifactIndexer.java | 2 +- .../slc/repo/ModularDistributionFactory.java | 4 +- .../slc/repo/ModularDistributionIndexer.java | 4 +- .../org/argeo/slc/repo/PdeSourcesIndexer.java | 4 +- .../src/org/argeo/slc/repo/RepoUtils.java | 4 +- .../src/org/argeo/slc/repo/RpmIndexer.java | 14 +- .../slc/repo/maven/ConvertPoms_01_03.java | 2 +- .../slc/repo/maven/GenerateBinaries.java | 4 +- .../repo/maven/ImportMavenDependencies.java | 6 +- .../slc/repo/maven/IndexDistribution.java | 2 +- .../slc/repo/maven/MavenConventionsUtils.java | 4 +- .../slc/repo/maven/MavenProxyServiceImpl.java | 2 +- .../argeo/slc/repo/maven/Migration_01_03.java | 4 +- .../argeo/slc/repo/osgi/ArchiveWrapper.java | 4 +- .../org/argeo/slc/repo/osgi/BndWrapper.java | 4 +- .../argeo/slc/repo/osgi/ImportBundlesZip.java | 4 +- .../org/argeo/slc/repo/osgi/MavenWrapper.java | 6 +- .../argeo/slc/repo/osgi/NormalizeGroup.java | 4 +- .../argeo/slc/repo/osgi/OsgiFactoryImpl.java | 4 +- .../slc/repo/osgi/ProcessDistribution.java | 4 +- .../org/argeo/slc/repo/osgi/UriWrapper.java | 4 +- org.argeo.slc.support/.classpath | 3 +- .../org/argeo/slc/aether/AetherUtilsTest.java | 4 +- .../org/argeo/slc/aether/AetherTemplate.java | 26 ++-- .../org/argeo/slc/aether/AetherUtils.java | 6 +- .../slc/aether/ArtifactIdComparator.java | 2 +- .../slc/aether/ConsoleRepositoryListener.java | 4 +- .../slc/aether/ConsoleTransferListener.java | 6 +- .../SimpleArtifactDescriptorReader.java | 10 +- .../aether/SimpleVersionRangeResolver.java | 12 +- .../slc/aether/SimpleVersionResolver.java | 10 +- .../argeo/slc/aether/osgi/OsgiVersion.java | 6 +- .../spring/RemoteRepositoryFactory.java | 21 +-- pom.xml | 34 ++--- 41 files changed, 167 insertions(+), 281 deletions(-) create mode 100644 dep/org.argeo.slc.dep.backend/bnd.bnd create mode 100644 dep/org.argeo.slc.dep.minimal/bnd.bnd delete mode 100644 org.argeo.slc.core/bin/log4j.properties rename {runtime/org.argeo.slc.support.aether/src/test/java => org.argeo.slc.support/ext/test}/org/argeo/slc/aether/AetherUtilsTest.java (96%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/AetherTemplate.java (83%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/AetherUtils.java (97%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/ArtifactIdComparator.java (96%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/ConsoleRepositoryListener.java (97%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/ConsoleTransferListener.java (96%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/SimpleArtifactDescriptorReader.java (76%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/SimpleVersionRangeResolver.java (77%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/SimpleVersionResolver.java (78%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/osgi/OsgiVersion.java (84%) rename {runtime/org.argeo.slc.support.aether/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java (78%) diff --git a/dep/org.argeo.slc.dep.backend/bnd.bnd b/dep/org.argeo.slc.dep.backend/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml index 82b0bbd67..3224adba0 100644 --- a/dep/org.argeo.slc.dep.backend/pom.xml +++ b/dep/org.argeo.slc.dep.backend/pom.xml @@ -59,40 +59,35 @@ org.argeo.slc - org.argeo.slc.support.simple - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.support.ant + org.argeo.slc.support 2.1.1-SNAPSHOT - - org.argeo.slc - org.argeo.slc.repo - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.rpmfactory - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.server.repo - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.server.repo.webapp - 2.1.1-SNAPSHOT - + + + + + + + + + + + + + + + + + + + + - org.argeo.commons.security + org.argeo.commons org.argeo.security.dep.node ${version.argeo-commons} pom diff --git a/dep/org.argeo.slc.dep.minimal/bnd.bnd b/dep/org.argeo.slc.dep.minimal/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml index 48ed7aabe..513a62649 100644 --- a/dep/org.argeo.slc.dep.minimal/pom.xml +++ b/dep/org.argeo.slc.dep.minimal/pom.xml @@ -46,36 +46,16 @@ org.argeo.slc.core 2.1.1-SNAPSHOT + + + + + - org.argeo.slc - org.argeo.slc.support.osgi - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.support.equinox - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.agent - 2.1.1-SNAPSHOT - - - org.argeo.commons.base + org.argeo.commons org.argeo.osgi.boot ${version.argeo-commons} - - org.argeo.tp - org.springframework.osgi.extender - - - org.argeo.commons.base - org.argeo.dep.log4j - ${version.argeo-commons} - pom - @@ -83,103 +63,39 @@ - - org.argeo.slc - org.argeo.slc.agent.cli - 2.1.1-SNAPSHOT - + + + + + - - org.argeo.slc - org.argeo.slc.support.jcr - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.agent.jcr - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.node.jackrabbit - 2.1.1-SNAPSHOT - + + + + + + + + + + - org.argeo.commons.server - org.argeo.node.repo.jackrabbit + org.argeo.commons + org.argeo.cms ${version.argeo-commons} - org.argeo.commons.security + org.argeo.commons org.argeo.security.core ${version.argeo-commons} - - - org.argeo.tp - org.apache.commons.vfs - - - org.argeo.tp - org.apache.xmlcommons - - - - - - - org.argeo.tp - org.apache.xmlcommons - - - org.argeo.tp - org.apache.xalan - - - - - org.argeo.tp - javax.annotation - - - - - org.argeo.commons.server - org.argeo.server.jackrabbit - ${version.argeo-commons} - - - org.argeo.commons.security - org.argeo.security.jackrabbit - ${version.argeo-commons} - - - - - org.argeo.commons.security - org.argeo.security.dao.jackrabbit - ${version.argeo-commons} - - - - - org.argeo.commons.security - org.argeo.security.dao.os - ${version.argeo-commons} - - - - - org.argeo.tp - org.h2 - diff --git a/dep/pom.xml b/dep/pom.xml index 2f8f8e9e0..828867443 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -10,12 +10,11 @@ SLC Dependencies pom - org.argeo.slc.dep.detached org.argeo.slc.dep.minimal org.argeo.slc.dep.backend - org.argeo.slc.dep.eclipse - org.argeo.slc.dep.rcp - org.argeo.slc.dep.rap + + + diff --git a/org.argeo.slc.core/bin/log4j.properties b/org.argeo.slc.core/bin/log4j.properties deleted file mode 100644 index 0133bab88..000000000 --- a/org.argeo.slc.core/bin/log4j.properties +++ /dev/null @@ -1,22 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=WARN, console - -## Levels -# Slc -log4j.logger.org.argeo=DEBUG - -# Castor -log4j.logger.org.exolab.castor=WARN - -# Spring -log4j.logger.org.springframework=WARN - - -## Appenders -# A1 is set to be a ConsoleAppender. -log4j.appender.console=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n - diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactDistribution.java index d76da463a..9a03b0157 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactDistribution.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactDistribution.java @@ -2,8 +2,8 @@ package org.argeo.slc.repo; import org.argeo.slc.CategorizedNameVersion; import org.argeo.slc.build.Distribution; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** A {@link Distribution} based on an Aether {@link Artifact} */ public class ArtifactDistribution implements Distribution, diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java index 27c6806a3..377b35a75 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java @@ -28,7 +28,7 @@ import org.argeo.slc.aether.AetherUtils; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; import org.osgi.framework.Constants; -import org.sonatype.aether.artifact.Artifact; +import org.eclipse.aether.artifact.Artifact; /** * Add {@link Artifact} properties to a {@link Node}. Does nothing if the node diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java index 79d3b5175..af96f232d 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java @@ -23,8 +23,8 @@ import org.argeo.slc.CategorizedNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; import org.osgi.framework.Constants; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** * Creates a jar bundle from an ArgeoOsgiDistribution. This jar is then diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java index bca049618..7b445345b 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java @@ -29,8 +29,8 @@ import org.argeo.slc.build.Distribution; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; import org.osgi.framework.Constants; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** * Create or update JCR meta-data for an SLC Modular Distribution diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java index 97ca286ce..bcaa7302e 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java @@ -29,8 +29,8 @@ import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.aether.AetherUtils; import org.argeo.slc.repo.maven.MavenConventionsUtils; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** * Creates pde sources from a source {@link Artifact} with name diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java index 4a175ac59..f03319ae3 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java @@ -65,8 +65,8 @@ import org.argeo.slc.jcr.SlcTypes; import org.argeo.slc.repo.maven.MavenConventionsUtils; import org.argeo.util.security.Keyring; import org.osgi.framework.Constants; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** Utilities around repo */ public class RepoUtils implements ArgeoNames, SlcNames { diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java index 57b93b8ec..f3675de71 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java @@ -1,7 +1,7 @@ package org.argeo.slc.repo; -import static org.freecompany.redline.header.Header.HeaderTag.HEADERIMMUTABLE; -import static org.freecompany.redline.header.Signature.SignatureTag.SIGNATURES; +import static org.redline_rpm.header.Header.HeaderTag.HEADERIMMUTABLE; +import static org.redline_rpm.header.Signature.SignatureTag.SIGNATURES; import java.io.InputStream; import java.nio.ByteBuffer; @@ -15,11 +15,11 @@ import org.apache.commons.io.FilenameUtils; import org.argeo.slc.SlcException; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; -import org.freecompany.redline.ChannelWrapper.Key; -import org.freecompany.redline.ReadableChannelWrapper; -import org.freecompany.redline.header.AbstractHeader; -import org.freecompany.redline.header.Format; -import org.freecompany.redline.header.Header; +import org.redline_rpm.ChannelWrapper.Key; +import org.redline_rpm.ReadableChannelWrapper; +import org.redline_rpm.header.AbstractHeader; +import org.redline_rpm.header.Format; +import org.redline_rpm.header.Header; /** Indexes an RPM file. */ public class RpmIndexer implements NodeIndexer, SlcNames { diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ConvertPoms_01_03.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ConvertPoms_01_03.java index 12cf49005..f05171513 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ConvertPoms_01_03.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ConvertPoms_01_03.java @@ -56,7 +56,7 @@ public class ConvertPoms_01_03 implements Runnable { "org.apache.activemq.optional"); artifactMapping.put("org.argeo.dep.osgi.activemq.xmpp", "org.apache.activemq.xmpp"); - artifactMapping.put("org.argeo.dep.osgi.aether", "org.sonatype.aether"); + artifactMapping.put("org.argeo.dep.osgi.aether", "org.eclipse.aether"); artifactMapping.put("org.argeo.dep.osgi.boilerpipe", "de.l3s.boilerpipe"); artifactMapping.put("org.argeo.dep.osgi.commons.cli", diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java index cd5283db4..a745bb22e 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java @@ -40,8 +40,8 @@ import org.argeo.slc.repo.ArtifactIndexer; import org.argeo.slc.repo.RepoConstants; import org.argeo.slc.repo.RepoUtils; import org.osgi.framework.Version; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** * Generates binaries-, sources- and sdk-version.pom artifacts for a given diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java index d1245ff95..c2b420374 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java @@ -41,9 +41,9 @@ import org.argeo.slc.repo.ArtifactIndexer; import org.argeo.slc.repo.JarFileIndexer; import org.argeo.slc.repo.RepoConstants; import org.argeo.slc.repo.RepoUtils; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.graph.DependencyNode; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.artifact.DefaultArtifact; /** * Import all the dependencies listed in a POM and their dependency graphs to a diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java index 758316d32..63e7d874c 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java @@ -31,7 +31,7 @@ import org.argeo.slc.SlcException; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; import org.argeo.slc.repo.RepoConstants; -import org.sonatype.aether.artifact.Artifact; +import org.eclipse.aether.artifact.Artifact; /** Create a distribution node from a set of artifacts */ public class IndexDistribution implements Runnable { diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java index 4e8d3fb83..1ec361ac2 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java @@ -26,8 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; import org.argeo.slc.aether.AetherTemplate; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java index fcd65d954..0349f3587 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java @@ -37,7 +37,7 @@ import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; import org.argeo.slc.repo.MavenProxyService; import org.argeo.slc.repo.RepoConstants; -import org.sonatype.aether.repository.RemoteRepository; +import org.eclipse.aether.repository.RemoteRepository; /** Synchronises the node repository with remote Maven repositories */ public class MavenProxyServiceImpl extends AbstractUrlProxy implements diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java index baf6ec723..7eb2e523e 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java @@ -50,8 +50,8 @@ import org.argeo.slc.repo.JarFileIndexer; import org.argeo.slc.repo.RepoUtils; import org.argeo.slc.repo.osgi.OsgiProfile; import org.osgi.framework.Constants; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** * Migrate the distribution from 1.2 to 1.4 by cleaning naming and dependencies. diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java index 29fa8f14d..9a9e96f01 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java @@ -35,8 +35,8 @@ import org.argeo.slc.build.Distribution; import org.argeo.slc.build.License; import org.argeo.slc.repo.OsgiFactory; import org.argeo.slc.repo.RepoUtils; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java index fce521181..1c9a5f890 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java @@ -14,8 +14,8 @@ import org.argeo.slc.SlcException; import org.argeo.slc.build.Distribution; import org.argeo.slc.build.License; import org.osgi.framework.Version; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.springframework.beans.factory.BeanNameAware; import aQute.lib.osgi.Builder; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java index 80574f8f6..fbc44b3e0 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java @@ -37,8 +37,8 @@ import org.argeo.slc.SlcException; import org.argeo.slc.repo.ArtifactIndexer; import org.argeo.slc.repo.JarFileIndexer; import org.argeo.slc.repo.RepoUtils; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** * Import all bundles in a zip file (typically an Eclipse distribution) into the diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java index ab7daeb11..a00a2bd4f 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java @@ -16,9 +16,9 @@ import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.repo.OsgiFactory; import org.argeo.slc.repo.RepoUtils; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; -import org.sonatype.aether.util.artifact.SubArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.util.artifact.SubArtifact; /** * BND wrapper based on a Maven artifact available from one of the configured diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java index 99f31bb04..ef61bf11c 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java @@ -44,8 +44,8 @@ import org.argeo.slc.repo.RepoUtils; import org.argeo.slc.repo.maven.MavenConventionsUtils; import org.osgi.framework.Constants; import org.osgi.framework.Version; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** * Make sure that all JCR metadata and Maven metadata are consistent for this diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java index bd4f4311c..0f918fdc3 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java @@ -28,8 +28,8 @@ import org.argeo.slc.jcr.SlcTypes; import org.argeo.slc.repo.NodeIndexer; import org.argeo.slc.repo.OsgiFactory; import org.argeo.slc.repo.maven.MavenConventionsUtils; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** Default implementation of {@link OsgiFactory}. */ public class OsgiFactoryImpl implements OsgiFactory, SlcNames { diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java index d16a79742..74c542528 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java @@ -16,8 +16,8 @@ import org.argeo.slc.repo.ArgeoOsgiDistribution; import org.argeo.slc.repo.ModularDistributionFactory; import org.argeo.slc.repo.OsgiFactory; import org.argeo.slc.repo.maven.MavenConventionsUtils; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; /** Executes the processes required so that all managed bundles are available. */ public class ProcessDistribution implements Runnable { diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java index cf0422e43..819b62386 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java @@ -18,8 +18,8 @@ import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.repo.OsgiFactory; import org.argeo.slc.repo.RepoUtils; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import aQute.lib.osgi.Jar; diff --git a/org.argeo.slc.support/.classpath b/org.argeo.slc.support/.classpath index bc86c4239..70b08e830 100644 --- a/org.argeo.slc.support/.classpath +++ b/org.argeo.slc.support/.classpath @@ -1,7 +1,8 @@ + - >> + diff --git a/runtime/org.argeo.slc.support.aether/src/test/java/org/argeo/slc/aether/AetherUtilsTest.java b/org.argeo.slc.support/ext/test/org/argeo/slc/aether/AetherUtilsTest.java similarity index 96% rename from runtime/org.argeo.slc.support.aether/src/test/java/org/argeo/slc/aether/AetherUtilsTest.java rename to org.argeo.slc.support/ext/test/org/argeo/slc/aether/AetherUtilsTest.java index 711bd73cd..ba22397bd 100644 --- a/runtime/org.argeo.slc.support.aether/src/test/java/org/argeo/slc/aether/AetherUtilsTest.java +++ b/org.argeo.slc.support/ext/test/org/argeo/slc/aether/AetherUtilsTest.java @@ -15,8 +15,8 @@ */ package org.argeo.slc.aether; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import junit.framework.TestCase; diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/AetherTemplate.java b/org.argeo.slc.support/src/org/argeo/slc/aether/AetherTemplate.java similarity index 83% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/AetherTemplate.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/AetherTemplate.java index c06161d22..a83caa1e0 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/AetherTemplate.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/AetherTemplate.java @@ -19,16 +19,16 @@ import java.io.File; import java.util.List; import org.argeo.slc.SlcException; -import org.sonatype.aether.RepositorySystem; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.collection.CollectRequest; -import org.sonatype.aether.graph.Dependency; -import org.sonatype.aether.graph.DependencyNode; -import org.sonatype.aether.repository.RemoteRepository; -import org.sonatype.aether.resolution.ArtifactRequest; -import org.sonatype.aether.resolution.ArtifactResolutionException; -import org.sonatype.aether.resolution.ArtifactResult; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.collection.CollectRequest; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.ArtifactRequest; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.resolution.ArtifactResult; /** Simplifies access to Aether. */ public class AetherTemplate { @@ -78,8 +78,10 @@ public class AetherTemplate { DependencyNode node = repositorySystem.collectDependencies( repositorySystemSession, collectRequest).getRoot(); - repositorySystem.resolveDependencies(repositorySystemSession, node, - null); + // FIXME adapt to changes in Aether + // repositorySystem.resolveDependencies(repositorySystemSession, + // node, + // null); return node; } catch (Exception e) { throw new SlcException("Cannot resolve dependencies of " + artifact diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/AetherUtils.java b/org.argeo.slc.support/src/org/argeo/slc/aether/AetherUtils.java similarity index 97% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/AetherUtils.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/AetherUtils.java index 1e52342fd..8da332b57 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/AetherUtils.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/AetherUtils.java @@ -21,9 +21,9 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.graph.DependencyNode; -import org.sonatype.aether.util.artifact.DefaultArtifact; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.artifact.DefaultArtifact; /** Utilities related to Aether */ public class AetherUtils { diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ArtifactIdComparator.java b/org.argeo.slc.support/src/org/argeo/slc/aether/ArtifactIdComparator.java similarity index 96% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ArtifactIdComparator.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/ArtifactIdComparator.java index c9d526546..6aa0ec69a 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ArtifactIdComparator.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/ArtifactIdComparator.java @@ -19,7 +19,7 @@ import java.util.Comparator; import java.util.TreeMap; import java.util.TreeSet; -import org.sonatype.aether.artifact.Artifact; +import org.eclipse.aether.artifact.Artifact; /** * Compare two artifacts, for use in {@link TreeSet} / {@link TreeMap}, consider diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ConsoleRepositoryListener.java b/org.argeo.slc.support/src/org/argeo/slc/aether/ConsoleRepositoryListener.java similarity index 97% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ConsoleRepositoryListener.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/ConsoleRepositoryListener.java index 45c4076d4..727c5f35d 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ConsoleRepositoryListener.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/ConsoleRepositoryListener.java @@ -17,8 +17,8 @@ package org.argeo.slc.aether; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.sonatype.aether.AbstractRepositoryListener; -import org.sonatype.aether.RepositoryEvent; +import org.eclipse.aether.AbstractRepositoryListener; +import org.eclipse.aether.RepositoryEvent; public class ConsoleRepositoryListener extends AbstractRepositoryListener { diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ConsoleTransferListener.java b/org.argeo.slc.support/src/org/argeo/slc/aether/ConsoleTransferListener.java similarity index 96% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ConsoleTransferListener.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/ConsoleTransferListener.java index a7399d0f5..3543d6847 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/ConsoleTransferListener.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/ConsoleTransferListener.java @@ -24,9 +24,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.sonatype.aether.transfer.AbstractTransferListener; -import org.sonatype.aether.transfer.TransferEvent; -import org.sonatype.aether.transfer.TransferResource; +import org.eclipse.aether.transfer.AbstractTransferListener; +import org.eclipse.aether.transfer.TransferEvent; +import org.eclipse.aether.transfer.TransferResource; public class ConsoleTransferListener extends AbstractTransferListener { private final static Log log = LogFactory diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleArtifactDescriptorReader.java b/org.argeo.slc.support/src/org/argeo/slc/aether/SimpleArtifactDescriptorReader.java similarity index 76% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleArtifactDescriptorReader.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/SimpleArtifactDescriptorReader.java index f97ddefe4..3aca17206 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleArtifactDescriptorReader.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/SimpleArtifactDescriptorReader.java @@ -15,11 +15,11 @@ */ package org.argeo.slc.aether; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.impl.ArtifactDescriptorReader; -import org.sonatype.aether.resolution.ArtifactDescriptorException; -import org.sonatype.aether.resolution.ArtifactDescriptorRequest; -import org.sonatype.aether.resolution.ArtifactDescriptorResult; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.impl.ArtifactDescriptorReader; +import org.eclipse.aether.resolution.ArtifactDescriptorException; +import org.eclipse.aether.resolution.ArtifactDescriptorRequest; +import org.eclipse.aether.resolution.ArtifactDescriptorResult; public class SimpleArtifactDescriptorReader implements ArtifactDescriptorReader { diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleVersionRangeResolver.java b/org.argeo.slc.support/src/org/argeo/slc/aether/SimpleVersionRangeResolver.java similarity index 77% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleVersionRangeResolver.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/SimpleVersionRangeResolver.java index 2d1ee285c..b7e7f9522 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleVersionRangeResolver.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/SimpleVersionRangeResolver.java @@ -16,12 +16,12 @@ package org.argeo.slc.aether; import org.argeo.slc.aether.osgi.OsgiVersion; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.impl.VersionRangeResolver; -import org.sonatype.aether.resolution.VersionRangeRequest; -import org.sonatype.aether.resolution.VersionRangeResolutionException; -import org.sonatype.aether.resolution.VersionRangeResult; -import org.sonatype.aether.version.Version; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.impl.VersionRangeResolver; +import org.eclipse.aether.resolution.VersionRangeRequest; +import org.eclipse.aether.resolution.VersionRangeResolutionException; +import org.eclipse.aether.resolution.VersionRangeResult; +import org.eclipse.aether.version.Version; public class SimpleVersionRangeResolver implements VersionRangeResolver { diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleVersionResolver.java b/org.argeo.slc.support/src/org/argeo/slc/aether/SimpleVersionResolver.java similarity index 78% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleVersionResolver.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/SimpleVersionResolver.java index eb20cc325..51a6490c5 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/SimpleVersionResolver.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/SimpleVersionResolver.java @@ -15,11 +15,11 @@ */ package org.argeo.slc.aether; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.impl.VersionResolver; -import org.sonatype.aether.resolution.VersionRequest; -import org.sonatype.aether.resolution.VersionResolutionException; -import org.sonatype.aether.resolution.VersionResult; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.impl.VersionResolver; +import org.eclipse.aether.resolution.VersionRequest; +import org.eclipse.aether.resolution.VersionResolutionException; +import org.eclipse.aether.resolution.VersionResult; public class SimpleVersionResolver implements VersionResolver { diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/osgi/OsgiVersion.java b/org.argeo.slc.support/src/org/argeo/slc/aether/osgi/OsgiVersion.java similarity index 84% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/osgi/OsgiVersion.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/osgi/OsgiVersion.java index 733c172bf..9f35ff99a 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/osgi/OsgiVersion.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/osgi/OsgiVersion.java @@ -19,9 +19,9 @@ import org.osgi.framework.Version; /** * Wraps an OSGi {@link Version} as an Aether - * {@link org.sonatype.aether.version.Version}. + * {@link org.eclipse.aether.version.Version}. */ -public class OsgiVersion implements org.sonatype.aether.version.Version { +public class OsgiVersion implements org.eclipse.aether.version.Version { final private Version version; public OsgiVersion(String str) { @@ -32,7 +32,7 @@ public class OsgiVersion implements org.sonatype.aether.version.Version { return version; } - public int compareTo(org.sonatype.aether.version.Version v) { + public int compareTo(org.eclipse.aether.version.Version v) { if (!(v instanceof OsgiVersion)) return 0; OsgiVersion ov = (OsgiVersion) v; diff --git a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java b/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java similarity index 78% rename from runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java rename to org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java index e5335b7d1..069e4c3e4 100644 --- a/runtime/org.argeo.slc.support.aether/src/main/java/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java +++ b/org.argeo.slc.support/src/org/argeo/slc/aether/spring/RemoteRepositoryFactory.java @@ -15,8 +15,8 @@ */ package org.argeo.slc.aether.spring; -import org.sonatype.aether.repository.Authentication; -import org.sonatype.aether.repository.RemoteRepository; +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 +30,15 @@ public class RemoteRepositoryFactory implements BeanNameAware, FactoryBean { private String password; public Object getObject() throws Exception { - RemoteRepository remoteRepository = new RemoteRepository( - id != null ? id : beanName, type, url); - if (username != null) { - Authentication authentication = new Authentication(username, - password); - remoteRepository.setAuthentication(authentication); - } - return remoteRepository; + // 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); +// } + return null; } public Class getObjectType() { diff --git a/pom.xml b/pom.xml index 6c15049a6..8d6fdae77 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.commons @@ -21,17 +22,18 @@ org.argeo.slc.api org.argeo.slc.core org.argeo.slc.unit + org.argeo.slc.support org.argeo.slc.repo - - - - + + + + - - - - + + dep + + http://projects.argeo.org/slc/ @@ -120,17 +122,9 @@ limitations under the License. warn - + argeo-tp-extras-local http://localhost:7080/data/public/java/argeo-tp-extras-2.1 -- 2.39.2