incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r505120 - in /incubator/yoko/trunk: bindings/pom.xml distribution/assembly-bin.xml distribution/pom.xml pom.xml
Date Fri, 09 Feb 2007 01:31:09 GMT
Author: rickmcguire
Date: Thu Feb  8 17:31:09 2007
New Revision: 505120

URL: http://svn.apache.org/viewvc?view=rev&rev=505120
Log:
YOKO-288 Fix project poms to use a hard-coded version attribute to get around maven snapshot
dependency bugs.


Modified:
    incubator/yoko/trunk/bindings/pom.xml
    incubator/yoko/trunk/distribution/assembly-bin.xml
    incubator/yoko/trunk/distribution/pom.xml
    incubator/yoko/trunk/pom.xml

Modified: incubator/yoko/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/pom.xml?view=diff&rev=505120&r1=505119&r2=505120
==============================================================================
--- incubator/yoko/trunk/bindings/pom.xml (original)
+++ incubator/yoko/trunk/bindings/pom.xml Thu Feb  8 17:31:09 2007
@@ -222,7 +222,7 @@
             <plugin>
                 <groupId>org.apache.yoko</groupId>
                 <artifactId>yoko-maven-plugins</artifactId>
-                <version>${project.version}</version>
+                <version>${version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>wsdl4j</groupId>
@@ -242,7 +242,7 @@
                     <dependency>
                         <groupId>org.apache.yoko</groupId>
                         <artifactId>yoko-api</artifactId>
-                        <version>${project.version}</version>
+                        <version>${version}</version>
                     </dependency>
                     <dependency>
                         <groupId>woodstox</groupId> 

Modified: incubator/yoko/trunk/distribution/assembly-bin.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/assembly-bin.xml?view=diff&rev=505120&r1=505119&r2=505120
==============================================================================
--- incubator/yoko/trunk/distribution/assembly-bin.xml (original)
+++ incubator/yoko/trunk/distribution/assembly-bin.xml Thu Feb  8 17:31:09 2007
@@ -56,7 +56,7 @@
       <directory>target</directory>
       <outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
       <includes>
-        <include>yoko-${project.version}.jar</include>
+        <include>yoko-${version}.jar</include>
       </includes>
     </fileSet>
     <fileSet>

Modified: incubator/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/pom.xml?view=diff&rev=505120&r1=505119&r2=505120
==============================================================================
--- incubator/yoko/trunk/distribution/pom.xml (original)
+++ incubator/yoko/trunk/distribution/pom.xml Thu Feb  8 17:31:09 2007
@@ -79,7 +79,7 @@
                                 <manifestEntries>                                 
  
                                     <Specification-Title>${yoko.name}</Specification-Title>
                                     <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                                    <Specification-Version>${project.version}</Specification-Version>
+                                    <Specification-Version>${version}</Specification-Version>
                                     <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
                                     <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
                                 </manifestEntries>                                
@@ -88,7 +88,7 @@
                                 <descriptor>assembly-bin.xml</descriptor>
                                 <descriptor>assembly-src.xml</descriptor>
                             </descriptors>
-                            <finalName>yoko-${project.version}</finalName>
+                            <finalName>yoko-${version}</finalName>
                         </configuration>
                     </execution>
                 </executions>
@@ -110,7 +110,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.yoko</groupId>
                                     <artifactId>yoko-api</artifactId>
-                                    <version>${project.version}</version>
+                                    <version>${version}</version>
                                     <classifier>javadoc</classifier>
                                 </artifactItem>
                             </artifactItems>
@@ -123,7 +123,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <finalName>yoko-${project.version}</finalName>
+                    <finalName>yoko-${version}</finalName>
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
@@ -131,7 +131,7 @@
                         <manifestEntries>                                    
                              <Specification-Title>${yoko.name}</Specification-Title>
                              <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                             <Specification-Version>${project.version}</Specification-Version>
+                             <Specification-Version>${version}</Specification-Version>
                              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
                             <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
                         </manifestEntries>                                

Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?view=diff&rev=505120&r1=505119&r2=505120
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Thu Feb  8 17:31:09 2007
@@ -45,6 +45,16 @@
 
     <!-- These properties should be defined in top level pom.xml -->
      <properties>
+        <!--
+        NOTE: Project version, to be used instead of ${pom.version} since that
+              value magically changes when using SNAPSHOT versions.
+
+              This value *must* be kept in sync with the value of the <version>
+              element, and it will need to be changed manually before a release,
+              as the maven-release-plugin will not update this value.
+        -->
+        <version>1.0-incubating-M2-SNAPSHOT</version>
+        
         <!-- versions of external dependencies -->
         <ant.version>1.6.5</ant.version>
         <antrun.version>1.1</antrun.version>
@@ -83,37 +93,37 @@
              <dependency>
                  <groupId>org.apache.yoko</groupId>
                  <artifactId>yoko-core</artifactId>
-                 <version>${project.version}</version>
+                 <version>${version}</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.yoko</groupId>
                  <artifactId>yoko-spec-corba</artifactId>
-                 <version>${project.version}</version>
+                 <version>${version}</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.yoko</groupId>
                  <artifactId>yoko-api</artifactId>
-                 <version>${project.version}</version>
+                 <version>${version}</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.yoko</groupId>
                  <artifactId>yoko-tools</artifactId>
-                 <version>${project.version}</version>
+                 <version>${version}</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.yoko</groupId>
                  <artifactId>yoko-bindings</artifactId>
-                 <version>${project.version}</version>
+                 <version>${version}</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.yoko</groupId>
                  <artifactId>yoko-rmi-spec</artifactId>
-                 <version>${project.version}</version>
+                 <version>${version}</version>
              </dependency>
              <dependency>
                  <groupId>org.apache.yoko</groupId>
                  <artifactId>yoko-rmi-impl</artifactId>
-                 <version>${project.version}</version>
+                 <version>${version}</version>
              </dependency>
              <!--  External dependencies --> 
              <dependency>
@@ -339,7 +349,7 @@
                         <manifestEntries>
                              <Specification-Title>${project.name}</Specification-Title>
                              <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                             <Specification-Version>${project.version}</Specification-Version>
+                             <Specification-Version>${version}</Specification-Version>
                              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
                             <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
                         </manifestEntries>



Mime
View raw message