You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2012/04/30 23:16:27 UTC
svn commit: r1332398 - in /geronimo/devtools/eclipse-plugin/trunk:
features/org.apache.geronimo.v30.feature/pom.xml plugins/pom.xml pom.xml
Author: gawor
Date: Mon Apr 30 21:16:27 2012
New Revision: 1332398
URL: http://svn.apache.org/viewvc?rev=1332398&view=rev
Log:
GERONIMODEVTOOLS-792: Improve formatting a bit
Modified:
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
geronimo/devtools/eclipse-plugin/trunk/pom.xml
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=1332398&r1=1332397&r2=1332398&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 Mon Apr 30 21:16:27 2012
@@ -102,17 +102,17 @@
</goals>
</execution>
</executions>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${pom.version}${buildNumberVersion}</Implementation-Version>
- </manifestEntries>
- </archive>
- <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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=1332398&r1=1332397&r2=1332398&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Mon Apr 30 21:16:27 2012
@@ -34,7 +34,7 @@
</parent>
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
@@ -91,9 +91,8 @@
</execution>
</executions>
<configuration>
- <regex>false</regex>
<file>META-INF/MANIFEST.MF</file>
- <token>Bundle-Version: ${pom.version}</token>
+ <token>Bundle-Version:.*</token>
<value>Bundle-Version: ${pom.version}${buildNumberVersion}</value>
<outputFile>target/classes/META-INF/MANIFEST.MF</outputFile>
</configuration>
@@ -101,17 +100,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- </execution>
- </executions>
<configuration>
<archive>
<manifestFile>${basedir}/target/classes/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Implementation-Version>${pom.version}${buildNumberVersion}</Implementation-Version>
- </manifestEntries>
+ <manifestEntries>
+ <Implementation-Version>${pom.version}${buildNumberVersion}</Implementation-Version>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=1332398&r1=1332397&r2=1332398&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Mon Apr 30 21:16:27 2012
@@ -93,7 +93,7 @@
<keystoreKeypass>devtools</keystoreKeypass>
<keystoreStorepass>geronimo</keystoreStorepass>
<keystoreValDays>3650</keystoreValDays>
- <buildNumberVersion></buildNumberVersion>
+ <buildNumberVersion></buildNumberVersion>
</properties>
<dependencyManagement>
@@ -228,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>
@@ -268,11 +268,11 @@
</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>
+ <!-- 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>
@@ -315,11 +315,13 @@
<skip>true</skip>
</configuration>
</plugin>
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.1</version>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
@@ -374,10 +376,10 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-4</version>
+ <version>1.0-beta-4</version>
<configuration>
- <buildNumberPropertyName>${project.artifactId}.buildNumber</buildNumberPropertyName>
- <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+ <buildNumberPropertyName>${project.artifactId}.buildNumber</buildNumberPropertyName>
+ <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
<format>{0,date,yyyyMMddHHmmss}</format>
<items>
<item>timestamp</item>
@@ -525,19 +527,19 @@
</modules>
</profile>
- <profile>
- <id>buildWithTimestamp</id>
- <properties>
- <buildNumberVersion>.v${geronimo-eclipse-plugin.buildNumber}</buildNumberVersion>
- </properties>
-
+ <profile>
+ <id>buildWithTimestamp</id>
+ <properties>
+ <buildNumberVersion>.v${geronimo-eclipse-plugin.buildNumber}</buildNumberVersion>
+ </properties>
+
<modules>
- <module>eclipse</module>
+ <module>eclipse</module>
<module>plugins</module>
<module>features</module>
<module>assembly</module>
</modules>
- </profile>
+ </profile>
<profile>
<id>testsuite</id>