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 ri...@apache.org on 2007/03/05 20:29:37 UTC
svn commit: r514853 - in /incubator/yoko:
branches/yoko-1.0-incubating-M2/api/
branches/yoko-1.0-incubating-M2/bindings/
branches/yoko-1.0-incubating-M2/core/
branches/yoko-1.0-incubating-M2/distribution/
branches/yoko-1.0-incubating-M2/maven-plugins/ ...
Author: rickmcguire
Date: Mon Mar 5 12:29:35 2007
New Revision: 514853
URL: http://svn.apache.org/viewvc?view=rev&rev=514853
Log:
Correct pom issues with the pom names and fix gpg errors in creating release deliverables.
Modified:
incubator/yoko/branches/yoko-1.0-incubating-M2/api/pom.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/bindings/pom.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/core/pom.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-bin.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-runtime-bin.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/pom.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/maven-plugins/pom.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-impl/pom.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-spec/pom.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/tools/pom.xml
incubator/yoko/branches/yoko-1.0-incubating-M2/yoko-spec-corba/pom.xml
incubator/yoko/trunk/api/pom.xml
incubator/yoko/trunk/bindings/pom.xml
incubator/yoko/trunk/core/pom.xml
incubator/yoko/trunk/distribution/assembly-bin.xml
incubator/yoko/trunk/distribution/assembly-runtime-bin.xml
incubator/yoko/trunk/distribution/pom.xml
incubator/yoko/trunk/maven-plugins/pom.xml
incubator/yoko/trunk/rmi-impl/pom.xml
incubator/yoko/trunk/rmi-spec/pom.xml
incubator/yoko/trunk/tools/pom.xml
incubator/yoko/trunk/yoko-spec-corba/pom.xml
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/api/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/api/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/api/pom.xml Mon Mar 5 12:29:35 2007
@@ -23,7 +23,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-api</artifactId>
<packaging>jar</packaging>
- <name>Yoko Public API</name>
+ <name>Apache Yoko Public API</name>
<parent>
<groupId>org.apache.yoko</groupId>
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/bindings/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/bindings/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/bindings/pom.xml Mon Mar 5 12:29:35 2007
@@ -23,7 +23,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-bindings</artifactId>
<packaging>jar</packaging>
- <name>Yoko Bindings</name>
+ <name>Apache Yoko Bindings</name>
<parent>
<groupId>org.apache.yoko</groupId>
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/core/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/core/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/core/pom.xml Mon Mar 5 12:29:35 2007
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
- <name>Yoko Core</name>
+ <name>Apache Yoko Core</name>
<packaging>jar</packaging>
<parent>
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-bin.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-bin.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-bin.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-bin.xml Mon Mar 5 12:29:35 2007
@@ -53,13 +53,6 @@
<outputDirectory>yoko-incubating-bin-1.0-M2/etc/third_party_licenses</outputDirectory>
</fileSet>
<fileSet>
- <directory>target</directory>
- <outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
- <includes>
- <include>yoko-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>target/javadoc</directory>
<outputDirectory>yoko-incubating-bin-1.0-M2/docs/api</outputDirectory>
<includes>
@@ -67,6 +60,15 @@
</includes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/yoko-distribution-${version}.jar</source>
+ <outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
+ <destName>yoko-${version}.jar</destName>
+ <!-- TODO - assembly 2.2 will change this to octal -->
+ <fileMode>436</fileMode>
+ </file>
+ </files>
<dependencySets>
<dependencySet>
<outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-runtime-bin.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-runtime-bin.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-runtime-bin.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/assembly-runtime-bin.xml Mon Mar 5 12:29:35 2007
@@ -47,14 +47,17 @@
<include>apache*.txt</include>
</includes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>yoko-incubating-runtime-bin-1.0-M2/lib</outputDirectory>
- <includes>
- <include>yoko-${version}.jar</include>
- </includes>
- </fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/yoko-distribution-${version}.jar</source>
+ <outputDirectory>yoko-incubating-runtime-bin-1.0-M2/lib</outputDirectory>
+ <destName>yoko-${version}.jar</destName>
+ <!-- TODO - assembly 2.2 will change this to octal -->
+ <fileMode>436</fileMode>
+ </file>
+ </files>
+
<dependencySets>
<dependencySet>
<outputDirectory>yoko-incubating-runtime-bin-1.0-M2/lib</outputDirectory>
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/distribution/pom.xml Mon Mar 5 12:29:35 2007
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-distribution</artifactId>
- <name>Yoko Distribution</name>
+ <name>Apache Yoko Distribution</name>
<url>http://www.apache.org/incubator/yoko</url>
<packaging>jar</packaging>
@@ -132,7 +132,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <finalName>yoko-${version}</finalName>
<archive>
<manifest>
<addClasspath>true</addClasspath>
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/maven-plugins/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/maven-plugins/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/maven-plugins/pom.xml Mon Mar 5 12:29:35 2007
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-maven-plugins</artifactId>
- <name>Yoko Maven plugins</name>
+ <name>Apache Yoko Maven plugins</name>
<packaging>maven-plugin</packaging>
<parent>
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-impl/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-impl/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-impl/pom.xml Mon Mar 5 12:29:35 2007
@@ -27,7 +27,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-impl</artifactId>
<packaging>jar</packaging>
- <name>Yoko RMI Implementation</name>
+ <name>Apache Yoko RMI Implementation</name>
<url>http://maven.apache.org</url>
<dependencies>
<!-- The JDK CORBA classes are also sufficient, so it is not necessary to add this dependency as
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-spec/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-spec/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-spec/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/rmi-spec/pom.xml Mon Mar 5 12:29:35 2007
@@ -27,7 +27,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-spec</artifactId>
<packaging>jar</packaging>
- <name>Yoko RMI Spec</name>
+ <name>Apache Yoko RMI Spec</name>
<url>http://maven.apache.org</url>
<dependencies>
<!-- The JDK CORBA classes are also sufficient, so it is not necessary to add this dependency as
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/tools/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/tools/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/tools/pom.xml Mon Mar 5 12:29:35 2007
@@ -22,7 +22,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-tools</artifactId>
<packaging>jar</packaging>
- <name>Yoko Command Line Tools</name>
+ <name>Apache Yoko Command Line Tools</name>
<parent>
<groupId>org.apache.yoko</groupId>
Modified: incubator/yoko/branches/yoko-1.0-incubating-M2/yoko-spec-corba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/yoko-1.0-incubating-M2/yoko-spec-corba/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/branches/yoko-1.0-incubating-M2/yoko-spec-corba/pom.xml (original)
+++ incubator/yoko/branches/yoko-1.0-incubating-M2/yoko-spec-corba/pom.xml Mon Mar 5 12:29:35 2007
@@ -30,7 +30,7 @@
<artifactId>yoko-spec-corba</artifactId>
<packaging>jar</packaging>
<version>1.0-incubating-M2</version>
- <name>Yoko CORBA Spec</name>
+ <name>Apache Yoko CORBA Spec</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
Modified: incubator/yoko/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/api/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/api/pom.xml (original)
+++ incubator/yoko/trunk/api/pom.xml Mon Mar 5 12:29:35 2007
@@ -23,7 +23,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-api</artifactId>
<packaging>jar</packaging>
- <name>Yoko Public API</name>
+ <name>Apache Yoko Public API</name>
<parent>
<groupId>org.apache.yoko</groupId>
Modified: incubator/yoko/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/bindings/pom.xml (original)
+++ incubator/yoko/trunk/bindings/pom.xml Mon Mar 5 12:29:35 2007
@@ -23,7 +23,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-bindings</artifactId>
<packaging>jar</packaging>
- <name>Yoko Bindings</name>
+ <name>Apache Yoko Bindings</name>
<parent>
<groupId>org.apache.yoko</groupId>
Modified: incubator/yoko/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/core/pom.xml (original)
+++ incubator/yoko/trunk/core/pom.xml Mon Mar 5 12:29:35 2007
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
- <name>Yoko Core</name>
+ <name>Apache Yoko Core</name>
<packaging>jar</packaging>
<parent>
Modified: incubator/yoko/trunk/distribution/assembly-bin.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/assembly-bin.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/distribution/assembly-bin.xml (original)
+++ incubator/yoko/trunk/distribution/assembly-bin.xml Mon Mar 5 12:29:35 2007
@@ -53,13 +53,6 @@
<outputDirectory>yoko-incubating-bin-1.0-M2/etc/third_party_licenses</outputDirectory>
</fileSet>
<fileSet>
- <directory>target</directory>
- <outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
- <includes>
- <include>yoko-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>target/javadoc</directory>
<outputDirectory>yoko-incubating-bin-1.0-M2/docs/api</outputDirectory>
<includes>
@@ -67,6 +60,15 @@
</includes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/yoko-distribution-${version}.jar</source>
+ <outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
+ <destName>yoko-${version}.jar</destName>
+ <!-- TODO - assembly 2.2 will change this to octal -->
+ <fileMode>436</fileMode>
+ </file>
+ </files>
<dependencySets>
<dependencySet>
<outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
Modified: incubator/yoko/trunk/distribution/assembly-runtime-bin.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/assembly-runtime-bin.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/distribution/assembly-runtime-bin.xml (original)
+++ incubator/yoko/trunk/distribution/assembly-runtime-bin.xml Mon Mar 5 12:29:35 2007
@@ -47,14 +47,17 @@
<include>apache*.txt</include>
</includes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>yoko-incubating-runtime-bin-1.0-M2/lib</outputDirectory>
- <includes>
- <include>yoko-${version}.jar</include>
- </includes>
- </fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/yoko-distribution-${version}.jar</source>
+ <outputDirectory>yoko-incubating-runtime-bin-1.0-M2/lib</outputDirectory>
+ <destName>yoko-${version}.jar</destName>
+ <!-- TODO - assembly 2.2 will change this to octal -->
+ <fileMode>436</fileMode>
+ </file>
+ </files>
+
<dependencySets>
<dependencySet>
<outputDirectory>yoko-incubating-runtime-bin-1.0-M2/lib</outputDirectory>
Modified: incubator/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/distribution/pom.xml (original)
+++ incubator/yoko/trunk/distribution/pom.xml Mon Mar 5 12:29:35 2007
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-distribution</artifactId>
- <name>Yoko Distribution</name>
+ <name>Apache Yoko Distribution</name>
<url>http://www.apache.org/incubator/yoko</url>
<packaging>jar</packaging>
@@ -132,7 +132,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <finalName>yoko-${version}</finalName>
<archive>
<manifest>
<addClasspath>true</addClasspath>
Modified: incubator/yoko/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/maven-plugins/pom.xml (original)
+++ incubator/yoko/trunk/maven-plugins/pom.xml Mon Mar 5 12:29:35 2007
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-maven-plugins</artifactId>
- <name>Yoko Maven plugins</name>
+ <name>Apache Yoko Maven plugins</name>
<packaging>maven-plugin</packaging>
<parent>
Modified: incubator/yoko/trunk/rmi-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-impl/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/rmi-impl/pom.xml (original)
+++ incubator/yoko/trunk/rmi-impl/pom.xml Mon Mar 5 12:29:35 2007
@@ -27,7 +27,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-impl</artifactId>
<packaging>jar</packaging>
- <name>Yoko RMI Implementation</name>
+ <name>Apache Yoko RMI Implementation</name>
<url>http://maven.apache.org</url>
<dependencies>
<!-- The JDK CORBA classes are also sufficient, so it is not necessary to add this dependency as
Modified: incubator/yoko/trunk/rmi-spec/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-spec/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/rmi-spec/pom.xml (original)
+++ incubator/yoko/trunk/rmi-spec/pom.xml Mon Mar 5 12:29:35 2007
@@ -27,7 +27,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-spec</artifactId>
<packaging>jar</packaging>
- <name>Yoko RMI Spec</name>
+ <name>Apache Yoko RMI Spec</name>
<url>http://maven.apache.org</url>
<dependencies>
<!-- The JDK CORBA classes are also sufficient, so it is not necessary to add this dependency as
Modified: incubator/yoko/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/tools/pom.xml (original)
+++ incubator/yoko/trunk/tools/pom.xml Mon Mar 5 12:29:35 2007
@@ -22,7 +22,7 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-tools</artifactId>
<packaging>jar</packaging>
- <name>Yoko Command Line Tools</name>
+ <name>Apache Yoko Command Line Tools</name>
<parent>
<groupId>org.apache.yoko</groupId>
Modified: incubator/yoko/trunk/yoko-spec-corba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/pom.xml?view=diff&rev=514853&r1=514852&r2=514853
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/pom.xml (original)
+++ incubator/yoko/trunk/yoko-spec-corba/pom.xml Mon Mar 5 12:29:35 2007
@@ -30,7 +30,7 @@
<artifactId>yoko-spec-corba</artifactId>
<packaging>jar</packaging>
<version>1.0-incubating-M2-SNAPSHOT</version>
- <name>Yoko CORBA Spec</name>
+ <name>Apache Yoko CORBA Spec</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>