Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2012-11-21 04:41:07 +0000
committerJesse McConnell2012-11-21 04:41:07 +0000
commit5e61bf8935e370386f776a3645371999ce6b28a8 (patch)
tree71f714ac6e790e2d6dc4e41204ad096123e6db75
parentde85ce491b222b269f49a37927a24ccfc50fe816 (diff)
parent99cd038f95ef31edf735720b528ddf287d29c970 (diff)
downloadorg.eclipse.jetty.project-5e61bf8935e370386f776a3645371999ce6b28a8.tar.gz
org.eclipse.jetty.project-5e61bf8935e370386f776a3645371999ce6b28a8.tar.xz
org.eclipse.jetty.project-5e61bf8935e370386f776a3645371999ce6b28a8.zip
Merge branch 'release-9'
-rw-r--r--examples/async-rest/pom.xml2
-rw-r--r--examples/embedded/pom.xml3
-rw-r--r--examples/pom.xml6
3 files changed, 8 insertions, 3 deletions
diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml
index 7b1cb51c02..fef9b672c1 100644
--- a/examples/async-rest/pom.xml
+++ b/examples/async-rest/pom.xml
@@ -1,6 +1,6 @@
<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">
<parent>
- <groupId>org.eclipse.jetty</groupId>
+ <groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId>
<version>9.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
index 0278b7bb0f..dfef886afd 100644
--- a/examples/embedded/pom.xml
+++ b/examples/embedded/pom.xml
@@ -1,11 +1,12 @@
<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">
<parent>
- <groupId>org.eclipse.jetty</groupId>
+ <groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId>
<version>9.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>example-jetty-embedded</artifactId>
<name>Example :: Jetty Embedded</name>
<description>Jetty Embedded Examples</description>
diff --git a/examples/pom.xml b/examples/pom.xml
index baf8bef591..1073633ddb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
<version>9.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.eclipse.jetty</groupId>
+ <groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId>
<name>Jetty Examples :: Parent</name>
<packaging>pom</packaging>
@@ -41,6 +41,10 @@
</plugins>
</build>
<modules>
+ <!--
+ - The async-rest and embedded are examples that have historical locations,
+ - new ones should appear nested under o.e.jetty.examples groupId
+ -->
<module>async-rest</module>
<module>embedded</module>
</modules>

Back to the top