Merge branch 'master' of github.com:etesla/tesla

mkristian · May 23, 2012 · 8e50cf7 · 8e50cf7
2 parents 545049d + ccec1ae
commit 8e50cf7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
@@ -33,10 +33,12 @@
   </properties>
 
   <dependencies>
+    <!--
     <dependency>
       <groupId>org.eclipse.tesla.shell</groupId>
       <artifactId>maven-provision</artifactId>
     </dependency>
+    -->
     <dependency>
       <groupId>org.sonatype.sisu</groupId>
       <artifactId>sisu-inject-bean</artifactId>
@@ -60,11 +62,13 @@
       <artifactId>aether-connector-file</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
       <scope>runtime</scope>
     </dependency>
+    -->
     <dependency>
       <groupId>org.sonatype.maven</groupId>
       <artifactId>wagon-ahc</artifactId>
@@ -176,13 +180,15 @@
                           <exclude>org.sonatype.gossip:gossip-slf4j</exclude>
                         </excludes>
                       </fileSet>
+                      <!--
                       <fileSet>
                         <directory>shell</directory>
                         <artifacts>
                           <artifact>org.eclipse.tesla.shell:tesla-shell-osgi-core</artifact>
                           <artifact>org.eclipse:org.eclipse.osgi</artifact>
                         </artifacts>
                       </fileSet>
+                      -->
                       <fileSet>
                         <directory>ext</directory>
                         <artifacts>