geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1333186 [1/2] - in /geronimo/devtools/eclipse-plugin/trunk: ./ assembly/ assembly/src/main/assembly/ eclipse/ features/ features/org.apache.geronimo.v30.feature/ plugins/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/ plugins/org.apache.g...
Date Wed, 02 May 2012 20:37:35 GMT
Author: gawor
Date: Wed May  2 20:37:33 2012
New Revision: 1333186

URL: http://svn.apache.org/viewvc?rev=1333186&view=rev
Log:
GERONIMODEVTOOLS-792: Fix Maven GEP versions and enable publishing of p2 and deployable zips

Added:
    geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES.txt
      - copied, changed from r1332335, geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES-3.0.0.txt
Removed:
    geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES-3.0.0.txt
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/PLUGIN_RELEASE-NOTES-3.0.0.txt
Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
    geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/about.ini
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/about.ini
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml

Copied: geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES.txt (from r1332335, geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES-3.0.0.txt)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES.txt?p2=geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES.txt&p1=geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES-3.0.0.txt&r1=1332335&r2=1333186&rev=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES-3.0.0.txt (original)
+++ geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES.txt Wed May  2 20:37:33 2012
@@ -1,4 +1,4 @@
-Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${geronimo-eclipse-plugin.buildNumber}
+Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} (${osgi.pom.version})
 
 
 Helpful URLs
@@ -80,6 +80,6 @@ GERONIMODEVTOOLS-604	Upgrade to eclipse 
 GERONIMODEVTOOLS-603	Make Geronimo 3.0 server runnable with GEP
 
 
-Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${geronimo-eclipse-plugin.buildNumber}
+Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} (${osgi.pom.version})
 
 @version $Rev: 894783 $ $Date: 2009-12-31 14:21:08 +0800 (Thu, 31 Dec 2009) $

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Wed May  2 20:37:33 2012
@@ -22,14 +22,14 @@
                         
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>assembly</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin :: Assembly</name>
                         
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>geronimo-eclipse-plugin</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
                         
@@ -50,26 +50,42 @@
 					<regex>false</regex>
 					<file>src/main/assembly/site.xml</file>
 					<token>($featureVersion)</token>
-					<value>${buildNumberVersion}</value>
+					<value>${osgi.pom.version}</value>
 					<outputFile>target/resources/site.xml</outputFile>
 				</configuration>
 			</plugin>
+
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>geronimo-eclipse-plugin-${project.parent.version}</finalName>
-                    <descriptors>
-                        <descriptor>src/main/assembly/deployable.xml</descriptor>
-                        <descriptor>src/main/assembly/updatesite.xml</descriptor>
-                        <descriptor>src/main/assembly/p2repo.xml</descriptor>
-                    </descriptors>
-                </configuration>
                 <executions>
                     <execution>
+                        <id>prepare</id>
+                        <configuration>
+                          <finalName>geronimo-eclipse-plugin</finalName>
+                          <descriptors>
+                            <descriptor>src/main/assembly/prepare.xml</descriptor>
+                          </descriptors>
+                        </configuration>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>assemble</id>
+                        <configuration>
+                          <finalName>geronimo-eclipse-plugin-${project.parent.version}</finalName>
+                          <descriptors>
+                            <descriptor>src/main/assembly/p2repo.xml</descriptor>
+                            <descriptor>src/main/assembly/deployable.xml</descriptor>
+                          </descriptors>
+                        </configuration>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -79,6 +95,38 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>fix-plugin-version</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <tasks>
+                              <move todir="${basedir}/target/geronimo-eclipse-plugin-base">
+                                <fileset dir="${basedir}/target/geronimo-eclipse-plugin-base">
+                                  <include name="**/*-*.jar"/>
+                                </fileset>
+                                <regexpmapper from="^(.*)${pom.version}(.*)$$" to="\1${osgi.pom.version}\2"/>
+                              </move>
+
+                              <taskdef resource="net/sf/antcontrib/antlib.xml" 
+                                       classpathref="maven.plugin.classpath" />
+
+                              <for param="file">
+                                  <fileset dir="${basedir}/target/geronimo-eclipse-plugin-base">
+                                      <include name="features/*.jar"/>
+                                  </fileset>
+                                  <sequential>
+                                      <basename property="jar.filename" file="@{file}"/>
+                                      <unzip src="@{file}" 
+                                             dest="${basedir}/target/geronimo-eclipse-plugin-base/features-unpacked/${jar.filename}"/>
+                                  </sequential>
+                              </for>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
                         <id>generate-p2-metadata</id>
                         <phase>package</phase>
                         <configuration>
@@ -110,17 +158,6 @@
                 </executions>
             </plugin>
         </plugins>
-         <pluginManagement>
-            <plugins>
-               <!-- skip deploy child artifacts in release process-->
-               <plugin>
-                   <artifactId>maven-deploy-plugin</artifactId>             
-                   <configuration>
-                     <skip>true</skip>
-                  </configuration>
-               </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
     <dependencies>
            

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Wed May  2 20:37:33 2012
@@ -23,79 +23,23 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
+
     <fileSets>
         <fileSet>
-            <directory>..</directory>
-            <outputDirectory>eclipse</outputDirectory>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/</directory>
+            <outputDirectory></outputDirectory>
             <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
+                <include>*.txt</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/plugins</directory>
+            <outputDirectory>plugins</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/features-unpacked</directory>
+            <outputDirectory>features</outputDirectory>
+        </fileSet>
     </fileSets>
-    <files>
-        <file>
-            <source>../features/org.apache.geronimo.v30.feature/target/classes/about_files/PLUGIN_RELEASE-NOTES-${pom.version}.txt</source>
-            <outputDirectory>eclipse</outputDirectory>
-            <!--  <filtered>true</filtered>
-                 ${pom.version} does not get expanded by this filtering :-(
-                 so I take a filtered version from earlier in the build for GERONIMODEVTOOLS-505
-              -->
-        </file>
-    </files>
-    <dependencySets>
-
-        <!-- 
-         |
-         | Plug-ins
-         |
-         -->
-        <dependencySet>
-            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>eclipse/plugins/</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.j2ee.v11.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jaxbmodel.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
-                <!-- need to add jee.v22.jaxbmodel -->
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v22.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v22</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v30</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.schemas</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.schemas</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.ui</include>
-             </includes>
-        </dependencySet>
-
-        <!-- 
-         |
-         | Features
-         |
-         -->
-        <dependencySet>
-            <outputDirectory>eclipse/features/${artifact.artifactId}_${artifact.version}${buildNumberVersion}</outputDirectory>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v30.feature</include>
-            </includes>
-        </dependencySet>
 
-    </dependencySets>
 </assembly>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml Wed May  2 20:37:33 2012
@@ -23,16 +23,25 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
+
     <fileSets>
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
+                <include>*.txt</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/plugins</directory>
+            <outputDirectory>plugins</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/features</directory>
+            <outputDirectory>features</outputDirectory>
+        </fileSet>
     </fileSets>
+
     <files>
         <file>
             <source>${basedir}/src/main/assembly/content.xml</source>
@@ -42,68 +51,6 @@
             <source>${basedir}/src/main/assembly/artifacts.xml</source>
             <outputDirectory>/</outputDirectory>
         </file>
-        <file>
-            <source>../features/org.apache.geronimo.v30.feature/target/classes/about_files/PLUGIN_RELEASE-NOTES-${pom.version}.txt</source>
-            <outputDirectory></outputDirectory>
-            <!--  <filtered>true</filtered>
-                 ${pom.version} does not get expanded by this filtering :-(
-                 so I take a filtered version from earlier in the build for GERONIMODEVTOOLS-505
-              -->
-        </file>
     </files>
-    <dependencySets>
-
-        <!-- 
-         |
-         | Plug-ins
-         |
-         -->
-        <dependencySet>
-            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>plugins/</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.j2ee.v11.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jaxbmodel.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
-                <!-- need to add jee.v22.jaxbmodel -->
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v22.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v22</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v30</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.schemas</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.schemas</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.ui</include>
-             </includes>
-        </dependencySet>
-
-        <!-- 
-         |
-         | Features
-         |
-         -->
-        <dependencySet>
-            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>features/</outputDirectory>
-            <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v30.feature</include>
-            </includes>
-        </dependencySet>
 
-    </dependencySets>
 </assembly>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml Wed May  2 20:37:33 2012
@@ -91,7 +91,7 @@
     <feature url="features/org.apache.geronimo.v22.feature_2.2.0.jar" id="org.apache.geronimo.v22.feature" version="2.2.0">
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
-    <feature url="features/org.apache.geronimo.v30.feature_3.0.0($featureVersion).jar" id="org.apache.geronimo.v30.feature" version="3.0.0($featureVersion)">
+    <feature url="features/org.apache.geronimo.v30.feature_($featureVersion).jar" id="org.apache.geronimo.v30.feature" version="($featureVersion)">
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Wed May  2 20:37:33 2012
@@ -23,83 +23,30 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
+
     <fileSets>
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
+                <include>*.txt</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/plugins</directory>
+            <outputDirectory>plugins</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/target/geronimo-eclipse-plugin-base/features</directory>
+            <outputDirectory>features</outputDirectory>
+        </fileSet>
     </fileSets>
+
     <files>
         <file>
             <source>${basedir}/target/resources/site.xml</source>
             <outputDirectory>/</outputDirectory>
         </file>
-        <file>
-            <source>../features/org.apache.geronimo.v30.feature/target/classes/about_files/PLUGIN_RELEASE-NOTES-${pom.version}.txt</source>
-            <outputDirectory></outputDirectory>
-            <!--  <filtered>true</filtered>
-                 ${pom.version} does not get expanded by this filtering :-(
-                 so I take a filtered version from earlier in the build for GERONIMODEVTOOLS-505
-              -->
-        </file>
     </files>
-    <dependencySets>
-
-        <!-- 
-         |
-         | Plug-ins
-         |
-         -->
-        <dependencySet>
-            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>plugins/</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.j2ee.v11.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jaxbmodel.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
-                <!-- need to add jee.v22.jaxbmodel -->
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v22.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v22</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v30</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.schemas</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.schemas</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.ui</include>
-             </includes>
-        </dependencySet>
-
-        <!-- 
-         |
-         | Features
-         |
-         -->
-        <dependencySet>
-            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>features/</outputDirectory>
-            <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v30.feature</include>
-            </includes>
-        </dependencySet>
 
-    </dependencySets>
 </assembly>

Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>eclipse</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin :: Eclipse</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>geronimo-eclipse-plugin</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml Wed May  2 20:37:33 2012
@@ -20,7 +20,7 @@
 <feature
       id="org.apache.geronimo.v30.feature"
       label="Geronimo v3.0 Server Adapter"
-      version="3.0.0${buildNumberVersion}"
+      version="${osgi.pom.version}"
       provider-name="%providerName"
       plugin="org.apache.geronimo.st.v30.core"
       image="bigG.gif">
@@ -54,168 +54,168 @@
          id="org.apache.geronimo.st.core"
          download-size="132"
          install-size="132"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.st.ui"
          download-size="164"
          install-size="164"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.st.schemas"
          download-size="72"
          install-size="72"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.runtime.common"
          download-size="1160"
          install-size="1160"
-         version="3.0.0${buildNumberVersion}"/>
+         version="${osgi.pom.version}"/>
         
     <plugin
          id="org.apache.geronimo.st.v21.core"
          download-size="48"
          install-size="48"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
     
     <plugin
          id="org.apache.geronimo.st.v21.ui"
          download-size="164"
          install-size="164"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
 
     <plugin
          id="org.apache.geronimo.runtime.v21"
          download-size="1252"
          install-size="1252"
-         version="3.0.0${buildNumberVersion}"/>
+         version="${osgi.pom.version}"/>
 
     <plugin
          id="org.apache.geronimo.jee.v21.jaxbmodel"
          download-size="140"
          install-size="140"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.st.v30.core"
          download-size="20"
          install-size="20"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.st.v30.jaxbmodel"
          download-size="20"
          install-size="20"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.st.v30.ui"
          download-size="16"
          install-size="16"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.runtime.v30"
          download-size="1052"
          install-size="1052"
-         version="3.0.0${buildNumberVersion}"/>
+         version="${osgi.pom.version}"/>
          
     <plugin
          id="org.apache.geronimo.st.v22.core"
          download-size="20"
          install-size="20"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.st.v22.ui"
          download-size="16"
          install-size="16"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.runtime.v22"
          download-size="1052"
          install-size="1052"
-         version="3.0.0${buildNumberVersion}"/>
+         version="${osgi.pom.version}"/>
          
     <plugin
          id="org.apache.geronimo.st.v20.core"
          download-size="20"
          install-size="20"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.st.v20.ui"
          download-size="16"
          install-size="16"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.runtime.v20"
          download-size="1052"
          install-size="1052"
-         version="3.0.0${buildNumberVersion}"/>
+         version="${osgi.pom.version}"/>
          
     <plugin
          id="org.apache.geronimo.st.v11.core"
          download-size="48"
          install-size="48"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
     
     <plugin
          id="org.apache.geronimo.st.v11.ui"
          download-size="164"
          install-size="164"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
 
     <plugin
          id="org.apache.geronimo.runtime.v11"
          download-size="1252"
          install-size="1252"
-         version="3.0.0${buildNumberVersion}"/>
+         version="${osgi.pom.version}"/>
 
     <plugin
          id="org.apache.geronimo.j2ee.v11.jaxbmodel"
          download-size="140"
          install-size="140"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
     
     <plugin
          id="org.apache.geronimo.st.v11.schemas"
          download-size="72"
          install-size="72"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
 
      <plugin
          id="org.apache.geronimo.jaxbmodel.common"
          download-size="31"
          install-size="31"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
 
      <plugin
          id="org.apache.geronimo.jee.v22.jaxbmodel"
          download-size="31"
          install-size="31"
-         version="3.0.0${buildNumberVersion}"
+         version="${osgi.pom.version}"
          unpack="false"/>
 </feature>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
                 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.v30.feature</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Geronimo Eclipse Plugin :: Features :: v30</name>
                 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-features-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
                 
@@ -78,7 +78,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <resource>
@@ -105,7 +105,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Implementation-Version>${pom.version}${buildNumberVersion}</Implementation-Version>
+                            <Implementation-Version>${osgi.pom.version}</Implementation-Version>
                         </manifestEntries>
                     </archive>
                     <keystore>../../${keystoreFile}</keystore>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Wed May  2 20:37:33 2012
@@ -22,14 +22,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>eclipse-features-parent</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin :: Features</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>geronimo-eclipse-plugin</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>  
   
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -112,7 +112,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
   
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
   
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -114,7 +114,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
   
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
   
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -112,7 +112,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
   
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.jee.v22.jaxbmodel</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
   
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -104,7 +104,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.runtime.common</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -83,7 +83,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.runtime.v11</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -84,7 +84,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.runtime.v20</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -85,7 +85,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.runtime.v21</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -85,7 +85,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.runtime.v22</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -85,7 +85,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.runtime.v30</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -85,7 +85,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
 			<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.core</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -98,7 +98,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.schemas</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -79,7 +79,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.ui</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -98,7 +98,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/about.ini
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/about.ini?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/about.ini (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/about.ini Wed May  2 20:37:33 2012
@@ -22,7 +22,7 @@
 # dialog.  Maximum 15 lines and 75 characters per line.
 #
 aboutText=Apache Geronimo v1.1 Server Adapter\n\
-Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}\n\
+Version: ${osgi.pom.version}\n\
 \n\
 (c) Copyright 2003-2011 The Apache Software Foundation\n\
 Visit http://www.apache.org/licenses/LICENSE-2.0.txt for additional details\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v11.core</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -85,7 +85,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
         
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v11.schemas</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
         
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
         
@@ -79,7 +79,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v11.ui</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -82,7 +82,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
         
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v20.core</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
         
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
         
@@ -84,7 +84,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
       
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v20.ui</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
       
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
       
@@ -84,7 +84,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini Wed May  2 20:37:33 2012
@@ -22,7 +22,7 @@
 # dialog.  Maximum 15 lines and 75 characters per line.
 #
 aboutText=Apache Geronimo v2.1 Server Adapter\n\
-Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}\n\
+Version: ${osgi.pom.version}\n\
 \n\
 (c) Copyright 2003-2011 The Apache Software Foundation\n\
 Visit http://www.apache.org/licenses/LICENSE-2.0.txt for additional details\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
        
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v21.core</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
        
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
        
@@ -96,7 +96,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
        
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v21.ui</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
        
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
        
@@ -84,7 +84,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini Wed May  2 20:37:33 2012
@@ -22,7 +22,7 @@
 # dialog.  Maximum 15 lines and 75 characters per line.
 #
 aboutText=Apache Geronimo v2.2 Server Adapter\n\
-Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}\n\
+Version: ${osgi.pom.version}\n\
 \n\
 (c) Copyright 2003-2011 The Apache Software Foundation\n\
 Visit http://www.apache.org/licenses/LICENSE-2.0.txt for additional details\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
     
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v22.core</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
     
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -96,7 +96,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v22.ui</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -84,7 +84,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/about.ini
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/about.ini?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/about.ini (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/about.ini Wed May  2 20:37:33 2012
@@ -22,7 +22,7 @@
 # dialog.  Maximum 15 lines and 75 characters per line.
 #
 aboutText=Apache Geronimo v3.0 Server Adapter\n\
-Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}\n\
+Version: ${osgi.pom.version}\n\
 \n\
 (c) Copyright 2003-2011 The Apache Software Foundation\n\
 Visit http://www.apache.org/licenses/LICENSE-2.0.txt for additional details\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
     
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v30.core</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
         
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
         
@@ -110,7 +110,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
   
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v30.jaxbmodel</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
   
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -98,7 +98,7 @@
                 <directory>../..</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
                 </includes>
             </resource>
             <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/pom.xml Wed May  2 20:37:33 2012
@@ -21,14 +21,14 @@
        
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>org.apache.geronimo.st.v30.ui</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
        
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>eclipse-plugins-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
        
@@ -105,7 +105,7 @@
 	    		<directory>../..</directory>
                 <filtering>true</filtering>
 	    		<includes>
-                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+                    <include>PLUGIN_RELEASE-NOTES.txt</include>
 	    		</includes>
 	    	</resource>
 	    	<resource>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Wed May  2 20:37:33 2012
@@ -22,14 +22,14 @@
                 
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>eclipse-plugins-parent</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin :: Plugins</name>
                 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>geronimo-eclipse-plugin</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 	
@@ -93,7 +93,7 @@
 					<configuration>
 						<file>META-INF/MANIFEST.MF</file>
 						<token>Bundle-Version:.*</token>
-						<value>Bundle-Version: ${pom.version}${buildNumberVersion}</value>
+						<value>Bundle-Version: ${osgi.pom.version}</value>
 						<outputFile>target/classes/META-INF/MANIFEST.MF</outputFile>
 					</configuration>
 				</plugin>
@@ -104,7 +104,7 @@
                         <archive>
                             <manifestFile>${basedir}/target/classes/META-INF/MANIFEST.MF</manifestFile>
                                 <manifestEntries>
-                                    <Implementation-Version>${pom.version}${buildNumberVersion}</Implementation-Version>
+                                    <Implementation-Version>${osgi.pom.version}</Implementation-Version>
                                 </manifestEntries>
                         </archive>
                     </configuration>
@@ -166,7 +166,7 @@
                      <skip>true</skip>
                   </configuration>
                </plugin>
-			</plugins>
+            </plugins>
         </pluginManagement>
     </build>
 	



Mime
View raw message