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/05/02 22:37:35 UTC
svn commit: r1333186 [2/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...
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Wed May 2 20:37:33 2012
@@ -22,7 +22,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin</name>
@@ -86,14 +86,13 @@
<properties>
<eclipseDownload>${settings.localRepository}/eclipse-downloads</eclipseDownload>
<eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
- <org.apache.geronimo.v30.feature_version>3.0.0</org.apache.geronimo.v30.feature_version>
<keystoreAlias>devtools</keystoreAlias>
<keystoreFile>keystore</keystoreFile>
<keystoreDname>CN=http://geronimo.apache.org,OU=Geronimo,O=Apache,L=Geronimo,S=Apache,C=US</keystoreDname>
<keystoreKeypass>devtools</keystoreKeypass>
<keystoreStorepass>geronimo</keystoreStorepass>
<keystoreValDays>3650</keystoreValDays>
- <buildNumberVersion></buildNumberVersion>
+ <osgi.pom.version>${gep.osgiVersion}</osgi.pom.version>
</properties>
<dependencyManagement>
@@ -249,6 +248,17 @@
<artifactId>ant-optional</artifactId>
<version>1.5.3-1</version>
</dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</plugin>
@@ -375,22 +385,17 @@
</plugin>
<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>
- </items>
- </configuration>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
+ <id>parse-version</id>
+ <configuration>
+ <propertyPrefix>gep</propertyPrefix>
+ </configuration>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
</execution>
</executions>
</plugin>
@@ -417,17 +422,17 @@
</configuration>
</plugin>
<!-- set attached as false to disable the automatic copy of LICNESE/NOTICE/DEPENDENCIES files -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <attached>false</attached>>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <attached>false</attached>>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -530,9 +535,35 @@
<profile>
<id>buildWithTimestamp</id>
<properties>
- <buildNumberVersion>.v${geronimo-eclipse-plugin.buildNumber}</buildNumberVersion>
+ <osgi.pom.version>${gep.majorVersion}.${gep.minorVersion}.${gep.incrementalVersion}.v${geronimo-eclipse-plugin.buildNumber}</osgi.pom.version>
</properties>
+ <build>
+ <plugins>
+ <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,yyyyMMdd-HHmmss}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
<module>eclipse</module>
<module>plugins</module>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-eclipse</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin :: Testsuite :: Eclipse</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-launcher</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin :: Testsuite :: Launcher</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.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>testsuite-plugins</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.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>testsuite-plugins</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.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>testsuite-plugins</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.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>testsuite-plugins</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.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>testsuite-plugins</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-plugins</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin :: Testsuite :: Plugins</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin :: Testsuite</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<description>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml?rev=1333186&r1=1333185&r2=1333186&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml Wed May 2 20:37:33 2012
@@ -24,14 +24,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-server</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin :: Testsuite :: Server(s)</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite</artifactId>
- <version>3.0.0</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<build>