You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jo...@apache.org on 2012/04/28 08:34:05 UTC
svn commit: r1331690 - in /geronimo/devtools/eclipse-plugin/trunk: ./
assembly/ assembly/src/main/assembly/ eclipse/
features/org.apache.geronimo.v30.feature/ plugins/
plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/
plugins/org.apache.geronimo.jaxbmode...
Author: johnxiao
Date: Sat Apr 28 06:34:03 2012
New Revision: 1331690
URL: http://svn.apache.org/viewvc?rev=1331690&view=rev
Log:
GERONIMODEVTOOLS-792 Provide the GEP build the unique timestamps each time
Modified:
geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES-3.0.0.txt
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/build.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/PLUGIN_RELEASE-NOTES-3.0.0.txt
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/license.html
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/about.html
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
Modified: 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-3.0.0.txt?rev=1331690&r1=1331689&r2=1331690&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES-3.0.0.txt (original)
+++ geronimo/devtools/eclipse-plugin/trunk/PLUGIN_RELEASE-NOTES-3.0.0.txt Sat Apr 28 06:34:03 2012
@@ -1,4 +1,4 @@
-Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${buildNumber}
+Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${geronimo-eclipse-plugin.buildNumber}
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} -- ${buildNumber}
+Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${geronimo-eclipse-plugin.buildNumber}
@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=1331690&r1=1331689&r2=1331690&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Sat Apr 28 06:34:03 2012
@@ -35,6 +35,25 @@
<build>
<plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <regex>false</regex>
+ <file>src/main/assembly/site.xml</file>
+ <token>($featureVersion)</token>
+ <value>${buildNumberVersion}</value>
+ <outputFile>target/resources/site.xml</outputFile>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -70,7 +89,7 @@
<mkdir dir="${assembly.dir}"/>
<makeurl property="assembly.dir.url" file="${assembly.dir}"/>
<unzip src="${input.zip}" dest="${assembly.dir}" />
- <copy file="${basedir}/src/main/assembly/site.xml" todir="${assembly.dir}"/>
+ <copy file="${basedir}/target/resources/site.xml" todir="${assembly.dir}"/>
<java fork="true" classname="org.eclipse.equinox.launcher.Main">
<classpath>
<fileset file="${eclipseInstall}/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"/>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -51,7 +51,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>eclipse/plugins/</outputDirectory>
<unpack>false</unpack>
<includes>
@@ -90,7 +90,7 @@
|
-->
<dependencySet>
- <outputDirectory>eclipse/features/${artifact.artifactId}_${artifact.version}</outputDirectory>
+ <outputDirectory>eclipse/features/${artifact.artifactId}_${artifact.version}${buildNumberVersion}</outputDirectory>
<unpack>true</unpack>
<includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v30.feature</include>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -59,7 +59,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>plugins/</outputDirectory>
<unpack>false</unpack>
<includes>
@@ -98,7 +98,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>features/</outputDirectory>
<includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v30.feature</include>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 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.jar" id="org.apache.geronimo.v30.feature" version="3.0.0">
+ <feature url="features/org.apache.geronimo.v30.feature_3.0.0($featureVersion).jar" id="org.apache.geronimo.v30.feature" version="3.0.0($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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -35,7 +35,7 @@
</fileSets>
<files>
<file>
- <source>${basedir}/src/main/assembly/site.xml</source>
+ <source>${basedir}/target/resources/site.xml</source>
<outputDirectory>/</outputDirectory>
</file>
<file>
@@ -55,7 +55,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>plugins/</outputDirectory>
<unpack>false</unpack>
<includes>
@@ -94,7 +94,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}_${artifact.version}${buildNumberVersion}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>features/</outputDirectory>
<includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v30.feature</include>
Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=1331690&r1=1331689&r2=1331690&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Sat Apr 28 06:34:03 2012
@@ -185,7 +185,7 @@
<isset property="is32bitJDK" />
</condition>
- <condition property="eclipseZip" value="${eclipse_basefilename}-win32_64.zip" >
+ <condition property="eclipseZip" value="${eclipse_basefilename}-win32-x86_64.zip" >
<isset property="is64bitJDK" />
</condition>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/PLUGIN_RELEASE-NOTES-3.0.0.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/PLUGIN_RELEASE-NOTES-3.0.0.txt?rev=1331690&r1=1331689&r2=1331690&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/PLUGIN_RELEASE-NOTES-3.0.0.txt (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/PLUGIN_RELEASE-NOTES-3.0.0.txt Sat Apr 28 06:34:03 2012
@@ -1,4 +1,4 @@
-Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${buildNumber}
+Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${geronimo-eclipse-plugin.buildNumber}
Helpful URLs
@@ -145,6 +145,6 @@ GERONIMODEVTOOLS-594 Geronimo server can
GERONIMODEVTOOLS-598 Support builds on Linux x86_64 based systems
-Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${buildNumber}
+Release Notes -- Apache Geronimo Eclipse Plugin -- Version ${pom.version} -- ${geronimo-eclipse-plugin.buildNumber}
@version $Rev$ $Date$
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -20,7 +20,7 @@
<feature
id="org.apache.geronimo.v30.feature"
label="Geronimo v3.0 Server Adapter"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
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"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.ui"
download-size="164"
install-size="164"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.schemas"
download-size="72"
install-size="72"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.runtime.common"
download-size="1160"
install-size="1160"
- version="3.0.0"/>
+ version="3.0.0${buildNumberVersion}"/>
<plugin
id="org.apache.geronimo.st.v21.core"
download-size="48"
install-size="48"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.v21.ui"
download-size="164"
install-size="164"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.runtime.v21"
download-size="1252"
install-size="1252"
- version="3.0.0"/>
+ version="3.0.0${buildNumberVersion}"/>
<plugin
id="org.apache.geronimo.jee.v21.jaxbmodel"
download-size="140"
install-size="140"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.v30.core"
download-size="20"
install-size="20"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.v30.jaxbmodel"
download-size="20"
install-size="20"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.v30.ui"
download-size="16"
install-size="16"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.runtime.v30"
download-size="1052"
install-size="1052"
- version="3.0.0"/>
+ version="3.0.0${buildNumberVersion}"/>
<plugin
id="org.apache.geronimo.st.v22.core"
download-size="20"
install-size="20"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.v22.ui"
download-size="16"
install-size="16"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.runtime.v22"
download-size="1052"
install-size="1052"
- version="3.0.0"/>
+ version="3.0.0${buildNumberVersion}"/>
<plugin
id="org.apache.geronimo.st.v20.core"
download-size="20"
install-size="20"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.v20.ui"
download-size="16"
install-size="16"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.runtime.v20"
download-size="1052"
install-size="1052"
- version="3.0.0"/>
+ version="3.0.0${buildNumberVersion}"/>
<plugin
id="org.apache.geronimo.st.v11.core"
download-size="48"
install-size="48"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.v11.ui"
download-size="164"
install-size="164"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.runtime.v11"
download-size="1252"
install-size="1252"
- version="3.0.0"/>
+ version="3.0.0${buildNumberVersion}"/>
<plugin
id="org.apache.geronimo.j2ee.v11.jaxbmodel"
download-size="140"
install-size="140"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.st.v11.schemas"
download-size="72"
install-size="72"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.jaxbmodel.common"
download-size="31"
install-size="31"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
<plugin
id="org.apache.geronimo.jee.v22.jaxbmodel"
download-size="31"
install-size="31"
- version="3.0.0"
+ version="3.0.0${buildNumberVersion}"
unpack="false"/>
</feature>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/license.html
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/license.html?rev=1331690&r1=1331689&r2=1331690&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/license.html (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/license.html Sat Apr 28 06:34:03 2012
@@ -16,7 +16,7 @@
-->
<html>
<body>
-Version: ${pom.version}-${buildNumber}
+Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}
<h3>License</h3>
The license for this feature is found here in the <a href="about_files/LICENSE.txt">about_files/LICENSE.txt</a> file.
<h3>Notices</h3>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -102,12 +102,17 @@
</goals>
</execution>
</executions>
- <configuration>
- <keystore>../../${keystoreFile}</keystore>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Version>${pom.version}${buildNumberVersion}</Implementation-Version>
+ </manifestEntries>
+ </archive>
+ <keystore>../../${keystoreFile}</keystore>
<alias>${keystoreAlias}</alias>
<storepass>${keystoreStorepass}</storepass>
<keypass>${keystoreKeypass}</keypass>
- </configuration>
+ </configuration>
</plugin>
</plugins>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/about.html
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/about.html?rev=1331690&r1=1331689&r2=1331690&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/about.html (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/about.html Sat Apr 28 06:34:03 2012
@@ -17,7 +17,7 @@
<html>
<body>
<h2>About This Content</h2>
-<p>Version: ${pom.version}-${buildNumber}</p>
+<p>Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}</p>
<h3>License</h3>
The license for this plugin is found here in the <a href="about_files/LICENSE.txt">about_files/LICENSE.txt</a> file.
<h3>Notices</h3>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -180,6 +180,10 @@
</filesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -157,6 +157,10 @@
</configuration>
</plugin>
-->
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -159,6 +159,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -151,6 +151,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -95,11 +95,16 @@
</excludes>
</resource>
</resources>
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -96,7 +96,12 @@
</excludes>
</resource>
</resources>
+
<plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -97,7 +97,12 @@
</excludes>
</resource>
</resources>
+
<plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -97,7 +97,12 @@
</excludes>
</resource>
</resources>
+
<plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -97,7 +97,12 @@
</excludes>
</resource>
</resources>
+
<plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -97,7 +97,12 @@
</excludes>
</resource>
</resources>
+
<plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -110,11 +110,16 @@
</excludes>
</resource>
</resources>
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -91,11 +91,16 @@
</excludes>
</resource>
</resources>
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -110,11 +110,16 @@
</excludes>
</resource>
</resources>
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 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}-${buildNumber}\n\
+Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}\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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -103,6 +103,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -96,6 +96,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -99,6 +99,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -101,6 +101,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -101,6 +101,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 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}-${buildNumber}\n\
+Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}\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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -115,6 +115,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -101,6 +101,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 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}-${buildNumber}\n\
+Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}\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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -114,6 +114,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -101,6 +101,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 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}-${buildNumber}\n\
+Version: ${pom.version}-${geronimo-eclipse-plugin.buildNumber}\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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -131,7 +131,11 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
- <plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -145,6 +145,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
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=1331690&r1=1331689&r2=1331690&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 Sat Apr 28 06:34:03 2012
@@ -122,6 +122,10 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=1331690&r1=1331689&r2=1331690&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Sat Apr 28 06:34:03 2012
@@ -32,9 +32,9 @@
<version>3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
@@ -52,8 +52,9 @@
</configuration>
</plugin>
</plugins>
+
<pluginManagement>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
@@ -78,12 +79,39 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <regex>false</regex>
+ <file>META-INF/MANIFEST.MF</file>
+ <token>Bundle-Version: ${pom.version}</token>
+ <value>Bundle-Version: ${pom.version}${buildNumberVersion}</value>
+ <outputFile>target/classes/META-INF/MANIFEST.MF</outputFile>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ </execution>
+ </executions>
<configuration>
<archive>
- <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>${basedir}/target/classes/META-INF/MANIFEST.MF</manifestFile>
+ <manifestEntries>
+ <Implementation-Version>${pom.version}${buildNumberVersion}</Implementation-Version>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
@@ -144,9 +172,10 @@
<skip>true</skip>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
</build>
+
<modules>
<module>org.apache.geronimo.jaxbmodel.common</module>
<module>org.apache.geronimo.jee.v21.jaxbmodel</module>
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=1331690&r1=1331689&r2=1331690&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Sat Apr 28 06:34:03 2012
@@ -93,6 +93,7 @@
<keystoreKeypass>devtools</keystoreKeypass>
<keystoreStorepass>geronimo</keystoreStorepass>
<keystoreValDays>3650</keystoreValDays>
+ <buildNumberVersion></buildNumberVersion>
</properties>
<dependencyManagement>
@@ -227,8 +228,8 @@
<sourceDirectory>src/main/</sourceDirectory>
<pluginManagement>
- <plugins>
- <plugin>
+ <plugins>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
@@ -265,7 +266,14 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-4</version>
</plugin>
-
+
+ <plugin>
+ <!-- Using the plugin to replace the content when processing the sources or resources -->
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ <version>1.4.1</version>
+ </plugin>
+
<plugin>
<groupId>com.sun.tools.xjc.maven2</groupId>
<artifactId>maven-jaxb-plugin</artifactId>
@@ -283,12 +291,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-4</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
<version>1.0</version>
</plugin>
@@ -372,7 +374,10 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-4</version>
<configuration>
+ <buildNumberPropertyName>${project.artifactId}.buildNumber</buildNumberPropertyName>
+ <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
<format>{0,date,yyyyMMddHHmmss}</format>
<items>
<item>timestamp</item>
@@ -519,7 +524,21 @@
<module>assembly</module>
</modules>
</profile>
-
+
+ <profile>
+ <id>buildWithTimestamp</id>
+ <properties>
+ <buildNumberVersion>.v${geronimo-eclipse-plugin.buildNumber}</buildNumberVersion>
+ </properties>
+
+ <modules>
+ <module>eclipse</module>
+ <module>plugins</module>
+ <module>features</module>
+ <module>assembly</module>
+ </modules>
+ </profile>
+
<profile>
<id>testsuite</id>
<modules>