mirror of https://github.com/apache/maven.git
revert the revert of r480835 - there must be an inconsistency in my home repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@483399 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7c6052772e
commit
2d9fc16efb
|
@ -26,22 +26,41 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>maven-embedder</artifactId>
|
<artifactId>maven-embedder</artifactId>
|
||||||
<name>Maven Embedder</name>
|
<name>Maven Embedder</name>
|
||||||
|
<properties>
|
||||||
|
<bundleVersion>2.1.0.v20061129-1142</bundleVersion>
|
||||||
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<directory>src/main/resources</directory>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
<finalName>${artifactId}-${bundleVersion}</finalName>
|
||||||
<descriptor>src/main/assembly/dep.xml</descriptor>
|
<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>
|
</configuration>
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>make-assembly</id>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>single</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
@ -57,22 +76,16 @@
|
||||||
<version>2.1-SNAPSHOT</version>
|
<version>2.1-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<reporting>
|
<distributionManagement>
|
||||||
<plugins>
|
<repository>
|
||||||
<!--
|
<id>apache.releases</id>
|
||||||
<plugin>
|
<name>Apache Release Distribution Repository</name>
|
||||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
|
||||||
</plugin>
|
</repository>
|
||||||
<plugin>
|
<snapshotRepository>
|
||||||
<artifactId>maven-clover-plugin</artifactId>
|
<id>apache.snapshots</id>
|
||||||
</plugin>
|
<name>Apache Development Snapshot Repository</name>
|
||||||
<plugin>
|
<url>file:///tmp/embedder</url>
|
||||||
<artifactId>maven-pmd-plugin</artifactId>
|
</snapshotRepository>
|
||||||
</plugin>
|
</distributionManagement>
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
-->
|
|
||||||
</plugins>
|
|
||||||
</reporting>
|
|
||||||
</project>
|
</project>
|
||||||
|
|
Loading…
Reference in New Issue