Update GEP trunk versions to 4.0.0-SNAPSHOT to support geronimo server trunk
git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk@1486728 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9979688..9422716 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,15 +22,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>assembly</artifactId>
- <version>3.0.1-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.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
@@ -100,18 +98,18 @@
<tasks>
<move todir="${basedir}/target/geronimo-eclipse-plugin-base">
<fileset dir="${basedir}/target/geronimo-eclipse-plugin-base">
- <include name="**/*-*.jar"/>
+ <include name="**/*-*.jar" />
</fileset>
- <regexpmapper from="^(.*)${pom.version}(.*)$$" to="\1${osgi.pom.version}\2"/>
+ <regexpmapper from="^(.*)${pom.version}(.*)$$" to="\1${osgi.pom.version}\2" />
</move>
- <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
+ <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"/>
+ <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}"/>
+ <basename property="jar.filename" file="@{file}" />
+ <unzip src="@{file}" dest="${basedir}/target/geronimo-eclipse-plugin-base/features-unpacked/${jar.filename}" />
</sequential>
</for>
</tasks>
@@ -126,23 +124,23 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="assembly.dir" value="${basedir}/target/p2-tmp"/>
- <property name="input.zip" value="${basedir}/target/geronimo-eclipse-plugin-${project.parent.version}-p2repo.zip"/>
- <property name="output.zip" value="${input.zip}"/>
- <mkdir dir="${assembly.dir}"/>
- <makeurl property="assembly.dir.url" file="${assembly.dir}"/>
- <unzip src="${input.zip}" dest="${assembly.dir}"/>
- <copy file="${basedir}/target/resources/site.xml" todir="${assembly.dir}"/>
+ <property name="assembly.dir" value="${basedir}/target/p2-tmp" />
+ <property name="input.zip" value="${basedir}/target/geronimo-eclipse-plugin-${project.parent.version}-p2repo.zip" />
+ <property name="output.zip" value="${input.zip}" />
+ <mkdir dir="${assembly.dir}" />
+ <makeurl property="assembly.dir.url" file="${assembly.dir}" />
+ <unzip src="${input.zip}" dest="${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"/>
+ <fileset file="${eclipseInstall}/eclipse/plugins/org.eclipse.equinox.launcher_*.jar" />
</classpath>
- <arg line="-application org.eclipse.equinox.p2.publisher.UpdateSitePublisher"/>
- <arg line="-metadataRepository ${assembly.dir.url}"/>
- <arg line="-artifactRepository ${assembly.dir.url}"/>
- <arg line="-source ${assembly.dir}"/>
+ <arg line="-application org.eclipse.equinox.p2.publisher.UpdateSitePublisher" />
+ <arg line="-metadataRepository ${assembly.dir.url}" />
+ <arg line="-artifactRepository ${assembly.dir.url}" />
+ <arg line="-source ${assembly.dir}" />
</java>
- <zip destfile="${output.zip}" update="true" includes="artifacts.xml content.xml" basedir="${assembly.dir}"/>
+ <zip destfile="${output.zip}" update="true" includes="artifacts.xml content.xml" basedir="${assembly.dir}" />
</tasks>
</configuration>
<goals>
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index ef62157..3db654b 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -15,21 +15,19 @@
~ limitations under the License.
-->
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" >
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin :: Eclipse</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
@@ -44,7 +42,7 @@
<configuration>
<tasks>
<property name="download_to" value="${eclipseDownload}" />
- <property name="extract_to" value="${eclipseInstall}" />
+ <property name="extract_to" value="${eclipseInstall}" />
<ant antfile="${basedir}/build.xml" />
</tasks>
</configuration>
diff --git a/features/org.apache.geronimo.v30.feature/pom.xml b/features/org.apache.geronimo.v30.feature/pom.xml
index c72d094..c03b689 100644
--- a/features/org.apache.geronimo.v30.feature/pom.xml
+++ b/features/org.apache.geronimo.v30.feature/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.v30.feature</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Geronimo Eclipse Plugin :: Features :: v30</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/features/pom.xml b/features/pom.xml
index c9e533e..08e34d1 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,15 +22,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin :: Features</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml b/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
index ea8820e..8499ca0 100644
--- a/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
+++ b/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml b/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml
index 36768df..b294e2c 100644
--- a/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml
+++ b/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml b/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
index deb3924..0a50ecf 100644
--- a/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
+++ b/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml b/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml
index 0f4906f..6f4a74b 100644
--- a/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml
+++ b/plugins/org.apache.geronimo.jee.v22.jaxbmodel/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.jee.v22.jaxbmodel</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/plugins/org.apache.geronimo.runtime.common/pom.xml b/plugins/org.apache.geronimo.runtime.common/pom.xml
index 880b2df..cf30c8b 100644
--- a/plugins/org.apache.geronimo.runtime.common/pom.xml
+++ b/plugins/org.apache.geronimo.runtime.common/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.common</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.runtime.v11/pom.xml b/plugins/org.apache.geronimo.runtime.v11/pom.xml
index 2d73d97..77e8292 100644
--- a/plugins/org.apache.geronimo.runtime.v11/pom.xml
+++ b/plugins/org.apache.geronimo.runtime.v11/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.v11</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/plugins/org.apache.geronimo.runtime.v20/pom.xml b/plugins/org.apache.geronimo.runtime.v20/pom.xml
index b1fbb44..4d3e62c 100644
--- a/plugins/org.apache.geronimo.runtime.v20/pom.xml
+++ b/plugins/org.apache.geronimo.runtime.v20/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.v20</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/plugins/org.apache.geronimo.runtime.v21/pom.xml b/plugins/org.apache.geronimo.runtime.v21/pom.xml
index ab8a2bc..6a5d9ee 100644
--- a/plugins/org.apache.geronimo.runtime.v21/pom.xml
+++ b/plugins/org.apache.geronimo.runtime.v21/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.v21</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/plugins/org.apache.geronimo.runtime.v22/pom.xml b/plugins/org.apache.geronimo.runtime.v22/pom.xml
index 743d506..8d37594 100644
--- a/plugins/org.apache.geronimo.runtime.v22/pom.xml
+++ b/plugins/org.apache.geronimo.runtime.v22/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.v22</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF b/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
index ac8dfa8..7fba5b9 100644
--- a/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
+++ b/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
@@ -6,22 +6,22 @@
Require-Bundle:
org.eclipse.osgi,
org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/geronimo-common-3.0.1-SNAPSHOT.jar,
- lib/geronimo-deployment-3.0.1-SNAPSHOT.jar,
- lib/geronimo-j2ee-schema-3.0.1-SNAPSHOT.jar,
- lib/geronimo-kernel-3.0.1-SNAPSHOT.jar,
- lib/geronimo-plugin-3.0.1-SNAPSHOT.jar,
- lib/geronimo-system-3.0.1-SNAPSHOT.jar,
- lib/geronimo-util-3.0.1-SNAPSHOT.jar,
- lib/geronimo-deploy-config-3.0.1-SNAPSHOT.jar,
+Bundle-ClassPath: lib/geronimo-common-3.0.1.jar,
+ lib/geronimo-deployment-3.0.1.jar,
+ lib/geronimo-j2ee-schema-3.0.1.jar,
+ lib/geronimo-kernel-3.0.1.jar,
+ lib/geronimo-plugin-3.0.1.jar,
+ lib/geronimo-system-3.0.1.jar,
+ lib/geronimo-util-3.0.1.jar,
+ lib/geronimo-deploy-config-3.0.1.jar,
lib/plexus-archiver-1.0-alpha-12.jar,
- lib/geronimo-crypto-3.0.1-SNAPSHOT.jar,
+ lib/geronimo-crypto-3.0.1.jar,
lib/slf4j-api-1.6.0.jar,
lib/slf4j-simple-1.6.1.jar,
- lib/geronimo-bundle-recorder-3.0.1-SNAPSHOT.jar,
- lib/geronimo-cli-3.0.1-SNAPSHOT.jar,
- lib/geronimo-deploy-jsr88-3.0.1-SNAPSHOT.jar,
- lib/geronimo-deploy-tool-3.0.1-SNAPSHOT.jar
+ lib/geronimo-bundle-recorder-3.0.1.jar,
+ lib/geronimo-cli-3.0.1.jar,
+ lib/geronimo-deploy-jsr88-3.0.1.jar,
+ lib/geronimo-deploy-tool-3.0.1.jar
Export-Package:
org.apache.geronimo.common;version=3.0,
org.apache.geronimo.common.propertyeditor;version=3.0,
diff --git a/plugins/org.apache.geronimo.runtime.v30/pom.xml b/plugins/org.apache.geronimo.runtime.v30/pom.xml
index a473c75..bc37b79 100644
--- a/plugins/org.apache.geronimo.runtime.v30/pom.xml
+++ b/plugins/org.apache.geronimo.runtime.v30/pom.xml
@@ -21,21 +21,19 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.v30</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
<!-- Make sure to update .classpath and META-INF/MANIFEST.MF files when changing
the Geronimo version property -->
- <geronimoVersion>3.0.1-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>3.0.1</geronimoVersion>
</properties>
<build>
<resources>
diff --git a/plugins/org.apache.geronimo.st.core/pom.xml b/plugins/org.apache.geronimo.st.core/pom.xml
index 7468609..1e05361 100644
--- a/plugins/org.apache.geronimo.st.core/pom.xml
+++ b/plugins/org.apache.geronimo.st.core/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.core</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.schemas/pom.xml b/plugins/org.apache.geronimo.st.schemas/pom.xml
index 1802fa7..b005d0b 100644
--- a/plugins/org.apache.geronimo.st.schemas/pom.xml
+++ b/plugins/org.apache.geronimo.st.schemas/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.schemas</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.ui/pom.xml b/plugins/org.apache.geronimo.st.ui/pom.xml
index 47e67c3..3da77c3 100644
--- a/plugins/org.apache.geronimo.st.ui/pom.xml
+++ b/plugins/org.apache.geronimo.st.ui/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.ui</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v11.core/pom.xml b/plugins/org.apache.geronimo.st.v11.core/pom.xml
index a59aa33..b3a80c1 100644
--- a/plugins/org.apache.geronimo.st.v11.core/pom.xml
+++ b/plugins/org.apache.geronimo.st.v11.core/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v11.core</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v11.schemas/pom.xml b/plugins/org.apache.geronimo.st.v11.schemas/pom.xml
index b8cea3b..80e7a29 100644
--- a/plugins/org.apache.geronimo.st.v11.schemas/pom.xml
+++ b/plugins/org.apache.geronimo.st.v11.schemas/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v11.schemas</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v11.ui/pom.xml b/plugins/org.apache.geronimo.st.v11.ui/pom.xml
index 9197eb4..f44ea82 100644
--- a/plugins/org.apache.geronimo.st.v11.ui/pom.xml
+++ b/plugins/org.apache.geronimo.st.v11.ui/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v11.ui</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v20.core/pom.xml b/plugins/org.apache.geronimo.st.v20.core/pom.xml
index 9e4541f..edf382f 100644
--- a/plugins/org.apache.geronimo.st.v20.core/pom.xml
+++ b/plugins/org.apache.geronimo.st.v20.core/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v20.core</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v20.ui/pom.xml b/plugins/org.apache.geronimo.st.v20.ui/pom.xml
index dc1be05..5fb3fa0 100644
--- a/plugins/org.apache.geronimo.st.v20.ui/pom.xml
+++ b/plugins/org.apache.geronimo.st.v20.ui/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v20.ui</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v21.core/pom.xml b/plugins/org.apache.geronimo.st.v21.core/pom.xml
index 7f3b461..00f3664 100644
--- a/plugins/org.apache.geronimo.st.v21.core/pom.xml
+++ b/plugins/org.apache.geronimo.st.v21.core/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v21.core</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v21.ui/pom.xml b/plugins/org.apache.geronimo.st.v21.ui/pom.xml
index d3bd7e1..833859f 100644
--- a/plugins/org.apache.geronimo.st.v21.ui/pom.xml
+++ b/plugins/org.apache.geronimo.st.v21.ui/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v21.ui</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v22.core/pom.xml b/plugins/org.apache.geronimo.st.v22.core/pom.xml
index 22a19f5..2182bcc 100644
--- a/plugins/org.apache.geronimo.st.v22.core/pom.xml
+++ b/plugins/org.apache.geronimo.st.v22.core/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v22.core</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v22.ui/pom.xml b/plugins/org.apache.geronimo.st.v22.ui/pom.xml
index 9d3944e..f38b43d 100644
--- a/plugins/org.apache.geronimo.st.v22.ui/pom.xml
+++ b/plugins/org.apache.geronimo.st.v22.ui/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v22.ui</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v30.core/pom.xml b/plugins/org.apache.geronimo.st.v30.core/pom.xml
index 5d908dd..74fab0a 100644
--- a/plugins/org.apache.geronimo.st.v30.core/pom.xml
+++ b/plugins/org.apache.geronimo.st.v30.core/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v30.core</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml b/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml
index 8aadf90..15d0980 100644
--- a/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml
+++ b/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v30.jaxbmodel</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/plugins/org.apache.geronimo.st.v30.ui/pom.xml b/plugins/org.apache.geronimo.st.v30.ui/pom.xml
index 1986853..1b713f1 100644
--- a/plugins/org.apache.geronimo.st.v30.ui/pom.xml
+++ b/plugins/org.apache.geronimo.st.v30.ui/pom.xml
@@ -21,15 +21,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.v30.ui</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 356abbd..d829bb7 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -22,15 +22,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin :: Plugins</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/pom.xml b/pom.xml
index 8805b9b..1841409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Geronimo Eclipse Plugin</name>
@@ -68,7 +68,7 @@
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk/</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk/</url>
+ <url>https://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/</url>
</scm>
<organization>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>4.3.0</version>
</dependency>
<dependency>
@@ -308,11 +308,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <configuration>
+ <version>2.3.2</version>
+ <configuration>
<useReleaseProfile>false</useReleaseProfile>
<allowTimestampedSnapshots>false</allowTimestampedSnapshots>
<preparationGoals>clean install</preparationGoals>
<goals>deploy</goals>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
diff --git a/testsuite/eclipse/pom.xml b/testsuite/eclipse/pom.xml
index 1c9aff4..61490da 100644
--- a/testsuite/eclipse/pom.xml
+++ b/testsuite/eclipse/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-eclipse</artifactId>
- <version>3.0.1-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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/testsuite/launcher/pom.xml b/testsuite/launcher/pom.xml
index c6515aa..342942d 100644
--- a/testsuite/launcher/pom.xml
+++ b/testsuite/launcher/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-launcher</artifactId>
- <version>3.0.1-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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml b/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
index 538a19a..b677d39 100644
--- a/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
+++ b/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.common</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-plugins</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml b/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
index dbed857..20da17b 100644
--- a/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
+++ b/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.v20</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-plugins</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml b/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
index 2b6de98..3ea1941 100644
--- a/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
+++ b/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.v21</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-plugins</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml b/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
index c5055ad..1bc353d 100644
--- a/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
+++ b/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.v22</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-plugins</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml b/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
index fc1340a..2e175bf 100644
--- a/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
+++ b/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.testsuite.v30</artifactId>
- <version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-plugins</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/testsuite/plugins/pom.xml b/testsuite/plugins/pom.xml
index 6725785..69799e2 100644
--- a/testsuite/plugins/pom.xml
+++ b/testsuite/plugins/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-plugins</artifactId>
- <version>3.0.1-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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 00db549..68a21da 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite</artifactId>
- <version>3.0.1-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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<description>
@@ -39,7 +38,7 @@
</description>
<properties>
- <geronimoVersion_1>3.0-SNAPSHOT</geronimoVersion_1>
+ <geronimoVersion_1>3.0.1</geronimoVersion_1>
<geronimoVersion_2>2.2.1</geronimoVersion_2>
<geronimoVersion_3>2.1.7</geronimoVersion_3>
<geronimoVersion_4>2.0.2</geronimoVersion_4>
diff --git a/testsuite/server/pom.xml b/testsuite/server/pom.xml
index bc305ce..3c7171c 100644
--- a/testsuite/server/pom.xml
+++ b/testsuite/server/pom.xml
@@ -24,14 +24,13 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>testsuite-server</artifactId>
- <version>3.0.1-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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<build>
@@ -50,7 +49,7 @@
| Unzip and rename the testsuite Geronimo server v3.0-SNAPSHOT
|
-->
- <property name="geronimoVersion_1" value="3.0-SNAPSHOT"/>
+ <property name="geronimoVersion_1" value="3.0.1"/>
<property name="geronimoVersion_1_install" value="${basedir}/../launcher/"/>
<property name="geronimoVersion_1_assembly" value="org/apache/geronimo/assemblies"/>
<property name="geronimoVersion_1_name" value="geronimo-tomcat7-javaee6"/>
