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 2012/04/17 23:23:34 UTC
svn commit: r1327288 - in /archiva/trunk: archiva-modules/archiva-base/archiva-configuration/pom.xml archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml pom.xml

Author: olamy
Date: Tue Apr 17 21:23:33 2012
New Revision: 1327288

URL: http://svn.apache.org/viewvc?rev=1327288&view=rev
Log:
use expression evaluator from apache namespace

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
    archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=1327288&r1=1327287&r2=1327288&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml Tue Apr 17 21:23:33 2012
@@ -85,7 +85,7 @@
       <artifactId>spring-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>plexus-expression-evaluator</artifactId>
     </dependency>
     <dependency>

Modified: archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml?rev=1327288&r1=1327287&r2=1327288&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml (original)
+++ archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml Tue Apr 17 21:23:33 2012
@@ -56,7 +56,7 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jxpath/${commons-jxpath.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration.bundle.version}</bundle>
-    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-expression-evaluator/${plexus-expression-evaluator.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components/plexus-expression-evaluator/${plexus-expression-evaluator.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-interpolation/${plexus-interpolation.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components.registry/spring-registry-api/${redback.registry.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components.registry/spring-registry-commons/${redback.registry.version}</bundle>

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1327288&r1=1327287&r2=1327288&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Apr 17 21:23:33 2012
@@ -767,7 +767,7 @@
         <version>${plexus-digest.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus</groupId>
+        <groupId>org.apache.archiva.redback.components</groupId>
         <artifactId>plexus-expression-evaluator</artifactId>
         <version>${plexus-expression-evaluator.version}</version>
         <exclusions>