Author: mcculls
Date: Sun Feb 17 08:07:14 2008
New Revision: 628500
URL: http://svn.apache.org/viewvc?rev=628500&view=rev
Log:
FELIX-491: initial copy of maven-obr-plugin files into bundleplugin (preserving
history)
Added:
felix/trunk/bundleplugin/LICENSE.kxml2
- copied unchanged from r627964,
felix/trunk/maven-obr-plugin/LICENSE.kxml2
felix/trunk/bundleplugin/src/main/java/org/apache/felix/obr/
- copied from r627964,
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/
felix/trunk/bundleplugin/src/main/java/org/osgi/
- copied from r627964,
felix/trunk/maven-obr-plugin/src/main/java/org/osgi/
felix/trunk/bundleplugin/src/main/resources/SchemaObr.xsd
- copied unchanged from r627964,
felix/trunk/maven-obr-plugin/src/main/resources/SchemaObr.xsd
Removed:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/OBRInstall.java
Modified:
felix/trunk/bundleplugin/NOTICE
felix/trunk/bundleplugin/pom.xml
felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml
Modified: felix/trunk/bundleplugin/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/NOTICE?rev=628500&r1=628499&r2=628500&view=diff
==============================================================================
--- felix/trunk/bundleplugin/NOTICE (original)
+++ felix/trunk/bundleplugin/NOTICE Sun Feb 17 08:07:14 2008
@@ -8,6 +8,11 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006-2008 The OSGi Alliance.
+Licensed under the Apache License 2.0.
+
II. Used Software
Modified: felix/trunk/bundleplugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/pom.xml?rev=628500&r1=628499&r2=628500&view=diff
==============================================================================
--- felix/trunk/bundleplugin/pom.xml (original)
+++ felix/trunk/bundleplugin/pom.xml Sun Feb 17 08:07:14 2008
@@ -51,6 +51,26 @@
<version>0.0.238</version>
</dependency>
<dependency>
+ <groupId>net.sf.kxml</groupId>
+ <artifactId>kxml2</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlpull</groupId>
+ <artifactId>xmlpull</artifactId>
+ <version>1.1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.service.obr</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.7</version>
@@ -76,6 +96,16 @@
<version>2.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
<version>1.1</version>
@@ -84,6 +114,11 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-osgi</artifactId>
<version>0.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>1.0-beta-2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified:
felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml?rev=628500&r1=628499&r2=628500&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml
Sun Feb 17 08:07:14 2008
@@ -38,7 +38,10 @@
org.apache.maven.plugins:maven-install-plugin:install,
org.apache.felix:maven-bundle-plugin:install
</install>
-
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+ <deploy>
+ org.apache.maven.plugins:maven-deploy-plugin:deploy<!--,
+ TODO: org.apache.felix:maven-bundle-plugin:deploy-->
+ </deploy>
</phases>
<!-- END SNIPPET: bundle-lifecycle -->
</lifecycle>
