Permalink
Browse files

GERONIMODEVTOOLS-792: Fix Maven GEP versions and enable publishing of…

… p2 and deployable zips

git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk@1333186 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 7597b16 commit 0f50f3783261ab9238589b2835b2e914f4eb692a Jarek Gawor committed May 2, 2012
Showing with 297 additions and 541 deletions.
  1. +2 −2 PLUGIN_RELEASE-NOTES-3.0.0.txt → PLUGIN_RELEASE-NOTES.txt
  2. +60 −23 assembly/pom.xml
  3. +12 −68 assembly/src/main/assembly/deployable.xml
  4. +12 −65 assembly/src/main/assembly/p2repo.xml
  5. +1 −1 assembly/src/main/assembly/site.xml
  6. +12 −65 assembly/src/main/assembly/updatesite.xml
  7. +2 −2 eclipse/pom.xml
  8. +0 −150 features/org.apache.geronimo.v30.feature/PLUGIN_RELEASE-NOTES-3.0.0.txt
  9. +26 −26 features/org.apache.geronimo.v30.feature/feature.xml
  10. +4 −4 features/org.apache.geronimo.v30.feature/pom.xml
  11. +2 −2 features/pom.xml
  12. +3 −3 plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
  13. +3 −3 plugins/org.apache.geronimo.jaxbmodel.common/pom.xml
  14. +3 −3 plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
  15. +3 −3 plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml
  16. +3 −3 plugins/org.apache.geronimo.runtime.common/pom.xml
  17. +3 −3 plugins/org.apache.geronimo.runtime.v11/pom.xml
  18. +3 −3 plugins/org.apache.geronimo.runtime.v20/pom.xml
  19. +3 −3 plugins/org.apache.geronimo.runtime.v21/pom.xml
  20. +3 −3 plugins/org.apache.geronimo.runtime.v22/pom.xml
  21. +3 −3 plugins/org.apache.geronimo.runtime.v30/pom.xml
  22. +3 −3 plugins/org.apache.geronimo.st.core/pom.xml
  23. +3 −3 plugins/org.apache.geronimo.st.schemas/pom.xml
  24. +3 −3 plugins/org.apache.geronimo.st.ui/pom.xml
  25. +1 −1 plugins/org.apache.geronimo.st.v11.core/about.ini
  26. +3 −3 plugins/org.apache.geronimo.st.v11.core/pom.xml
  27. +3 −3 plugins/org.apache.geronimo.st.v11.schemas/pom.xml
  28. +3 −3 plugins/org.apache.geronimo.st.v11.ui/pom.xml
  29. +3 −3 plugins/org.apache.geronimo.st.v20.core/pom.xml
  30. +3 −3 plugins/org.apache.geronimo.st.v20.ui/pom.xml
  31. +1 −1 plugins/org.apache.geronimo.st.v21.core/about.ini
  32. +3 −3 plugins/org.apache.geronimo.st.v21.core/pom.xml
  33. +3 −3 plugins/org.apache.geronimo.st.v21.ui/pom.xml
  34. +1 −1 plugins/org.apache.geronimo.st.v22.core/about.ini
  35. +3 −3 plugins/org.apache.geronimo.st.v22.core/pom.xml
  36. +3 −3 plugins/org.apache.geronimo.st.v22.ui/pom.xml
  37. +1 −1 plugins/org.apache.geronimo.st.v30.core/about.ini
  38. +3 −3 plugins/org.apache.geronimo.st.v30.core/pom.xml
  39. +3 −3 plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml
  40. +3 −3 plugins/org.apache.geronimo.st.v30.ui/pom.xml
  41. +5 −5 plugins/pom.xml
  42. +60 −29 pom.xml
  43. +2 −2 testsuite/eclipse/pom.xml
  44. +2 −2 testsuite/launcher/pom.xml
  45. +2 −2 testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
  46. +2 −2 testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
  47. +2 −2 testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
  48. +2 −2 testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
  49. +2 −2 testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
  50. +2 −2 testsuite/plugins/pom.xml
  51. +2 −2 testsuite/pom.xml
  52. +2 −2 testsuite/server/pom.xml
@@ -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 3.5.2
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) $
View
@@ -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>
@@ -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>
@@ -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>
@@ -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>
Oops, something went wrong.

0 comments on commit 0f50f37

Please sign in to comment.