Author: jdumay
Date: Thu Nov 13 16:05:59 2008
New Revision: 713876
URL: http://svn.apache.org/viewvc?rev=713876&view=rev
Log:
Adding felix config to the consumer pom
Modified:
archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
archiva/branches/archiva-plugins/pom.xml
Modified:
archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=713876&r1=713875&r2=713876&view=diff
==============================================================================
---
archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
(original)
+++
archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
Thu Nov 13 16:05:59 2008
@@ -26,6 +26,7 @@
<artifactId>archiva-core-consumers</artifactId>
<name>Archiva Consumers :: Core Consumers</name>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -45,6 +46,10 @@
<artifactId>plexus-digest</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId>
<scope>test</scope>
@@ -62,4 +67,19 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Export-Package>org.apache.archiva.consumers.core,org.apache.maven.archiva.consumers.core.repository</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java?rev=713876&r1=713875&r2=713876&view=diff
==============================================================================
---
archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
(original)
+++
archiva/branches/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
Thu Nov 13 16:05:59 2008
@@ -19,8 +19,6 @@
* under the License.
*/
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ConfigurationNames;
import org.apache.maven.archiva.configuration.FileTypes;
Modified: archiva/branches/archiva-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-plugins/pom.xml?rev=713876&r1=713875&r2=713876&view=diff
==============================================================================
--- archiva/branches/archiva-plugins/pom.xml (original)
+++ archiva/branches/archiva-plugins/pom.xml Thu Nov 13 16:05:59 2008
@@ -225,6 +225,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
<version>1.4</version>
@@ -237,8 +242,8 @@
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>