Skip to content

Commit

Permalink
GERONIMODEVTOOLS-792: Fix Maven GEP versions and enable publishing of…
Browse files Browse the repository at this point in the history 
… 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
@jgawor
jgawor committed May 2, 2012
1 parent 7597b16 commit 0f50f37
Show file tree
Hide file tree
Showing 52 changed files with 297 additions and 541 deletions.
4 changes: 2 additions & 2 deletions PLUGIN_RELEASE-NOTES-3.0.0.txt → PLUGIN_RELEASE-NOTES.txt
View file
@@ -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
Expand Down Expand Up @@ -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) $
83 changes: 60 additions & 23 deletions assembly/pom.xml
View file
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -78,6 +94,38 @@
<groupId>org.apache.maven.plugins</groupId>
<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>
Expand Down Expand Up @@ -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>

Expand Down
80 changes: 12 additions & 68 deletions assembly/src/main/assembly/deployable.xml
View file
Expand Up @@ -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>
77 changes: 12 additions & 65 deletions assembly/src/main/assembly/p2repo.xml
View file
Expand Up @@ -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>
Expand All @@ -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>
2 changes: 1 addition & 1 deletion assembly/src/main/assembly/site.xml
View file
Expand Up @@ -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>

Expand Down

0 comments on commit 0f50f37

Please sign in to comment.