summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-07-04 07:41:47 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-07-04 07:41:47 +0000
commita13ec3fecb91339e5c8e50f839c55824a71aa493 (patch)
tree6d1d70f5201aa09fc5880e2100a06ad59f29184e /branches
parentbe229c39de128257c1f9695285fe828ae6f3a359 (diff)
Merge archetype jetty property fix from trunk to m3 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791075 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml2
-rw-r--r--branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml5
-rw-r--r--branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml3
-rw-r--r--branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml2
4 files changed, 7 insertions, 5 deletions
diff --git a/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
index ecb1c8678d..a218324611 100644
--- a/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
+++ b/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
@@ -151,7 +151,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
<configuration>
<systemProperties>
<systemProperty>
diff --git a/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
index b378ac6b0b..db916053cf 100644
--- a/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
+++ b/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
@@ -133,7 +133,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -147,7 +147,8 @@
<properties>
<tuscany.version>2.0-M3-SNAPSHOT</tuscany.version>
<myfaces.version>1.5</myfaces.version>
- </properties>
+ <jetty.version>6.1.4</jetty.version>
+ </properties>
#end
</project>
diff --git a/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
index bceee75c3c..db68d576bf 100644
--- a/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
+++ b/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
@@ -103,7 +103,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -117,6 +117,7 @@
<properties>
<tuscany.version>2.0-M3-SNAPSHOT</tuscany.version>
<stripes.version>1.5</stripes.version>
+ <jetty.version>6.1.4</jetty.version>
</properties>
#end
diff --git a/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 1bc6d90687..f253853fb8 100644
--- a/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -118,7 +118,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>