You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by ad...@apache.org on 2007/08/11 06:25:14 UTC
svn commit: r564839 - in /incubator/yoko/trunk: core/pom.xml
distribution/pom.xml pom.xml
Author: adc
Date: Fri Aug 10 23:25:14 2007
New Revision: 564839
URL: http://svn.apache.org/viewvc?view=rev&rev=564839
Log:
YOKO-405 maven-jar-plugin is now in its proper place
Modified:
incubator/yoko/trunk/core/pom.xml
incubator/yoko/trunk/distribution/pom.xml
incubator/yoko/trunk/pom.xml
Modified: incubator/yoko/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/pom.xml?view=diff&rev=564839&r1=564838&r2=564839
==============================================================================
--- incubator/yoko/trunk/core/pom.xml (original)
+++ incubator/yoko/trunk/core/pom.xml Fri Aug 10 23:25:14 2007
@@ -77,18 +77,6 @@
</execution>
</executions>
</plugin>
- <!-- plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: incubator/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/pom.xml?view=diff&rev=564839&r1=564838&r2=564839
==============================================================================
--- incubator/yoko/trunk/distribution/pom.xml (original)
+++ incubator/yoko/trunk/distribution/pom.xml Fri Aug 10 23:25:14 2007
@@ -35,7 +35,6 @@
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
<java.source.version>1.4</java.source.version>
- <yoko.name>Yoko Corba Server</yoko.name>
</properties>
<dependencies>
@@ -53,28 +52,7 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- <manifestEntries>
- <Specification-Title>${yoko.name}</Specification-Title>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${version}</Specification-Version>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build/>
<profiles>
<profile>
@@ -125,7 +103,7 @@
<mainClass>yokoinstaller.Installer</mainClass>
</manifest>
<manifestEntries>
- <Specification-Title>${yoko.name}</Specification-Title>
+ <Specification-Title>${project.name}</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
<Specification-Version>${version}</Specification-Version>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
@@ -192,7 +170,7 @@
<mainClass>yokoinstaller.Installer</mainClass>
</manifest>
<manifestEntries>
- <Specification-Title>${yoko.name}</Specification-Title>
+ <Specification-Title>${project.name}</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
<Specification-Version>${version}</Specification-Version>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?view=diff&rev=564839&r1=564838&r2=564839
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Fri Aug 10 23:25:14 2007
@@ -360,25 +360,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${jar.version}</version>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${version}</Specification-Version>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.version}</version>
<configuration>
@@ -426,6 +407,25 @@
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${jar.version}</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ <manifestEntries>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${version}</Specification-Version>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>