You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2007/04/10 21:53:01 UTC
svn commit: r527266 [2/2] - in /geronimo/devtools/eclipse-plugin/trunk: ./
assembly/ emf/ emf/geronimo-1.0/ emf/geronimo-1.1/ features/
features/org.apache.geronimo.feature/
features/org.apache.geronimo.installableruntime.jetty.feature/
features/org.ap...
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml?view=diff&rev=527266&r1=527265&r2=527266
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml Tue Apr 10 12:52:59 2007
@@ -14,28 +14,22 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<!-- $Rev$ $Date$ -->
-
+<!-- $Rev$ $Date$ -->
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
<packaging>jar</packaging>
- <version>${org.apache.geronimo.v11.deployment.model_version}</version>
<name>${artifactId}</name>
-
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>1.0</version>
+ <version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
<properties>
<imported-resources>
${project.build.directory}/imported-resources</imported-resources>
</properties>
-
<build>
<resources>
<resource>
@@ -54,10 +48,9 @@
</includes>
</resource>
</resources>
-
<plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
@@ -83,7 +76,7 @@
<artifactItem>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-1.1-emf</artifactId>
- <version>1.0</version>
+ <version>${version}</version>
<type>jar</type>
</artifactItem>
</artifactItems>
@@ -168,4 +161,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?view=diff&rev=527266&r1=527265&r2=527266
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Tue Apr 10 12:52:59 2007
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
@@ -16,20 +15,17 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<!-- $Rev$ $Date$ -->
-
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
<packaging>pom</packaging>
- <name>Parent POM :: ${artifactId}</name>
- <version>1.0</version>
+ <name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>1.1</version>
+ <version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
@@ -101,7 +97,7 @@
<goal>run</goal>
</goals>
</execution>
- <!-- workaround for bugzilla 147936 -->
+<!-- workaround for bugzilla 147936 -->
<execution>
<id>backup</id>
<phase>process-sources</phase>
@@ -109,7 +105,6 @@
<tasks>
<copy file="${basedir}/.classpath" todir="${project.build.directory}" overwrite="false" failonerror="false"/>
<copy file="${basedir}/.project" todir="${project.build.directory}" overwrite="false" failonerror="false"/>
-
</tasks>
</configuration>
<goals>
@@ -123,14 +118,13 @@
<tasks>
<copy file="${project.build.directory}/.classpath" todir="${basedir}" overwrite="true" failonerror="false"/>
<copy file="${project.build.directory}/.project" todir="${basedir}" overwrite="true" failonerror="false"/>
-
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
- <!-- /workaround -->
+<!-- /workaround -->
</executions>
</plugin>
<plugin>
@@ -138,10 +132,10 @@
<configuration>
<filesets>
<fileset>
- <directory>.</directory>
- <includes>
- <include>lib</include>
- </includes>
+ <directory>.</directory>
+ <includes>
+ <include>lib</include>
+ </includes>
</fileset>
</filesets>
</configuration>
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?view=diff&rev=527266&r1=527265&r2=527266
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Tue Apr 10 12:52:59 2007
@@ -21,8 +21,8 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
<packaging>pom</packaging>
- <name>Root POM :: ${artifactId}</name>
- <version>1.1</version>
+ <name>${artifactId}</name>
+ <version>2.0.0</version>
<description>Parent POM for Geronimo Eclipse Plugin</description>
<url>http://geronimo.apache.org/devtools</url>
<prerequisites>
@@ -69,27 +69,7 @@
<url>http://geronimo.apache.org/</url>
</organization>
<properties>
- <common.plugin.version>2.0.0</common.plugin.version>
- <!-- Plugin Versions -->
- <org.apache.geronimo.st.core_version>${common.plugin.version}</org.apache.geronimo.st.core_version>
- <org.apache.geronimo.st.v1.core_version>${common.plugin.version}</org.apache.geronimo.st.v1.core_version>
- <org.apache.geronimo.st.v11.core_version>${common.plugin.version}</org.apache.geronimo.st.v11.core_version>
- <org.apache.geronimo.st.v12.core_version>${common.plugin.version}</org.apache.geronimo.st.v12.core_version>
- <org.apache.geronimo.st.v20.core_version>${common.plugin.version}</org.apache.geronimo.st.v20.core_version>
- <org.apache.geronimo.st.ui_version>${common.plugin.version}</org.apache.geronimo.st.ui_version>
- <org.apache.geronimo.st.v1.ui_version>${common.plugin.version}</org.apache.geronimo.st.v1.ui_version>
- <org.apache.geronimo.st.v11.ui_version>${common.plugin.version}</org.apache.geronimo.st.v11.ui_version>
- <org.apache.geronimo.runtime.common_version>${common.plugin.version}</org.apache.geronimo.runtime.common_version>
- <org.apache.geronimo.runtime.v1_version>${common.plugin.version}</org.apache.geronimo.runtime.v1_version>
- <org.apache.geronimo.runtime.v11_version>${common.plugin.version}</org.apache.geronimo.runtime.v11_version>
- <org.apache.geronimo.runtime.v12_version>${common.plugin.version}</org.apache.geronimo.runtime.v12_version>
- <org.apache.geronimo.runtime.v20_version>${common.plugin.version}</org.apache.geronimo.runtime.v20_version>
- <org.apache.geronimo.common.deployment.model_version>${common.plugin.version}</org.apache.geronimo.common.deployment.model_version>
- <org.apache.geronimo.common.deployment.model.edit_version>${common.plugin.version}</org.apache.geronimo.common.deployment.model.edit_version>
- <org.apache.geronimo.deployment.model_version>${common.plugin.version}</org.apache.geronimo.deployment.model_version>
- <org.apache.geronimo.deployment.model.edit_version>${common.plugin.version}</org.apache.geronimo.deployment.model.edit_version>
- <org.apache.geronimo.v11.deployment.model_version>${common.plugin.version}</org.apache.geronimo.v11.deployment.model_version>
- <org.apache.geronimo.v11.deployment.model.edit_version>${common.plugin.version}</org.apache.geronimo.v11.deployment.model.edit_version>
+ <bundle.version>2.0.0</bundle.version>
<!-- Feature Versions -->
<org.apache.geronimo.feature_version>2.0.0</org.apache.geronimo.feature_version>
<org.apache.geronimo.v10.feature_version>2.0.0</org.apache.geronimo.v10.feature_version>
@@ -287,7 +267,6 @@
</repository>
</repositories>
<modules>
- <!--<module>modules/eclipse-support</module>-->
<module>maven-plugins</module>
<module>emf</module>
<module>plugins</module>