Return-Path: 
 <commits-return-9504-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: (qmail 86709 invoked from network); 7 Dec 2006 09:53:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Dec 2006 09:53:46 -0000
Received: (qmail 10608 invoked by uid 500); 7 Dec 2006 09:53:42 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 10524 invoked by uid 500); 7 Dec 2006 09:53:42 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 10481 invoked by uid 99); 7 Dec 2006 09:53:42 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2006 01:53:41 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2006 01:53:32 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 948311A9846; Thu,  7 Dec 2006 01:52:50 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r483399 - /maven/components/trunk/maven-embedder/pom.xml
Date: Thu, 07 Dec 2006 09:52:50 -0000
To: commits@maven.apache.org
From: handyande@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061207095250.948311A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: handyande
Date: Thu Dec  7 01:52:49 2006
New Revision: 483399

URL: http://svn.apache.org/viewvc?view=rev&rev=483399
Log:
revert the revert of r480835 - there must be an inconsistency in my home repository

Modified:
    maven/components/trunk/maven-embedder/pom.xml

Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?view=diff&rev=483399&r1=483398&r2=483399
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Thu Dec  7 01:52:49 2006
@@ -26,22 +26,41 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-embedder</artifactId>
   <name>Maven Embedder</name>
+  <properties>
+    <bundleVersion>2.1.0.v20061129-1142</bundleVersion>
+  </properties>
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>        
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1</version>
         <configuration>
+          <finalName>${artifactId}-${bundleVersion}</finalName>
           <descriptor>src/main/assembly/dep.xml</descriptor>
+          <archive>
+            <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+            <!--
+
+            This doesn't work and should
+
+            <manifestEntries>
+              <Manifest-Version>1.0</Manifest-Version>
+              <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+              <Bundle-Name>Maven 2.x Embedder Plug-in</Bundle-Name>
+              <Bundle-Vendor>org.apache.maven</Bundle-Vendor>
+              <Bundle-SymbolicName>org.maven.ide.embedder</Bundle-SymbolicName>
+              <Bundle-Version>${project.version}</Bundle-Version>
+              <Bundle-ClassPath>.</Bundle-ClassPath>
+            </manifestEntries>
+            -->
+          </archive>
         </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
@@ -57,22 +76,16 @@
       <version>2.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-<!--
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clover-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
- -->
-    </plugins>
-  </reporting>
+  <distributionManagement>
+    <repository>
+      <id>apache.releases</id>
+      <name>Apache Release Distribution Repository</name>
+      <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Development Snapshot Repository</name>
+      <url>file:///tmp/embedder</url>
+    </snapshotRepository>
+  </distributionManagement>
 </project>