Merge branch 'master' into release

jmcc0nn3ll · jmcc0nn3ll · commit ec0076ecf66f · 2012-10-29T16:43:02.000-05:00
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>
+    <artifactId>jetty-parent</artifactId>
+    <groupId>org.eclipse.jetty</groupId>
+    <version>20</version>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-documentation</artifactId>
@@ -236,39 +241,5 @@
       </releases>
     </pluginRepository>
   </pluginRepositories>
-  <distributionManagement>
-    <repository>
-      <id>oss.sonatype.org</id>
-      <name>Sonatype OSS Nexus Repository</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-    </repository>
-    <snapshotRepository>
-      <id>oss.sonatype.org</id>
-      <name>Sonatype OSS SNAPSHOTS Nexus Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-  </distributionManagement>
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.4</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
diff --git a/src/docbkx/jetty.xml b/src/docbkx/jetty.xml
@@ -150,10 +150,8 @@ xmlns:ns="http://docbook.org/ns/docbook">
             as a specific section and give it justice
            -->
     <xi:include href="advanced/jmx/chapter.xml" />
-
 <!-- Information about the start.jar -->
     <xi:include href="advanced/jetty-start/chapter.xml" />
-
 <!-- How to use the jetty-maven-plugin is a big topic and is definitely 
                         in the advanced section of things. -->
     <xi:include href="advanced/maven/chapter.xml" />
