You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/11/30 05:45:41 UTC
svn commit: r480835 - in /maven/components/trunk/maven-embedder: Plugin.java
notes.txt pom.xml run.sh src/main/assembly/dep.xml
Author: jvanzyl
Date: Wed Nov 29 20:45:40 2006
New Revision: 480835
URL: http://svn.apache.org/viewvc?view=rev&rev=480835
Log:
o not sure what happened but i couldn't make an assembly the way i used to, so i reverted
o added an OSGi manifest to make it easier to Eugene to integrate into Eclipse
Removed:
maven/components/trunk/maven-embedder/Plugin.java
maven/components/trunk/maven-embedder/notes.txt
maven/components/trunk/maven-embedder/run.sh
Modified:
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/assembly/dep.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=480835&r1=480834&r2=480835
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Wed Nov 29 20:45:40 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>
Modified: maven/components/trunk/maven-embedder/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/assembly/dep.xml?view=diff&rev=480835&r1=480834&r2=480835
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/assembly/dep.xml (original)
+++ maven/components/trunk/maven-embedder/src/main/assembly/dep.xml Wed Nov 29 20:45:40 2006
@@ -7,7 +7,6 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
<directory>target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
@@ -15,7 +14,6 @@
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
- <outputFileNameMapping></outputFileNameMapping>
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>