diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-06-10 15:37:00 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-06-10 15:37:00 +0000 |
| commit | 45b308aab041fc4d0e4c198f32a1d4f57d366ed7 (patch) | |
| tree | 97f097d83cde642b08e03111b737e539e5447c57 /archiva-modules/archiva-base | |
| parent | d9ba2b6814028104bf673437da1baf889c7bbbae (diff) | |
| download | archiva-45b308aab041fc4d0e4c198f32a1d4f57d366ed7.tar.gz archiva-45b308aab041fc4d0e4c198f32a1d4f57d366ed7.zip | |
align maven api to use maven 3 version
temporary comment failing dependency tree
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134349 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base')
2 files changed, 4 insertions, 4 deletions
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index c5ae11579..4c5373692 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> + <artifactId>maven-compat</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java index cf774fe0d..8a155bc7c 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/PlexusSisuBridge.java @@ -50,9 +50,9 @@ public class PlexusSisuBridge private Logger log = LoggerFactory.getLogger( getClass() ); - private boolean containerAutoWiring = false; + private boolean containerAutoWiring = true; - private String containerClassPathScanning = PlexusConstants.SCANNING_OFF; + private String containerClassPathScanning = PlexusConstants.SCANNING_ON; private String containerComponentVisibility = PlexusConstants.REALM_VISIBILITY; @@ -91,7 +91,7 @@ public class PlexusSisuBridge conf.setRealm( classRealm ); - conf.setClassWorld( classWorld ); + //conf.setClassWorld( classWorld ); try { |