diff --git a/xdoc/announcements/1.5.ann b/xdoc/announcements/1.5.ann
deleted file mode 100644
index 982430be..00000000
--- a/xdoc/announcements/1.5.ann
+++ /dev/null
@@ -1,49 +0,0 @@
-The Maven team is pleased to announce the XDoc plugin 1.5 release!
-
-http://maven.apache.org/reference/plugins/xdoc/
-
-A plugin for converting Anakia xdocs into styled HTML
-
-User-visible changes in this version:
-
- - generated site is valid tableless XHTML with a fully css layout.
- - Html elements are now used properly: link lists are ul,
- titles are h1, h2, etc.
- - invalid html produced for sections "name" elements is now fixed,
- escaping unvalid chars (replaced by "_").
- - Hrefs for local links (starting with "#") are fixed accordingly during transformation
- - whitespace in output has been dramatically reduced (only preserved in sensitive elements
- such as pre, script, style
- - fixes layout during loading in internet explorer: empty images in the
- nav bar are popping up with the default blue border and text is
- initially unstyled.
- - No empty images are used anymore ("handles" for nav bar are created using css)
- - xdoc:copy-user-resources also copies resource from maven.gen.docs and
- not only from maven.docs.src: this allows for reporting plugins to generate
- images without copying them directly to maven.docs.dest
- - users can add links _after_ the standard project info/project reports section
- setting the "type" attribute to "footer" for the menu element
- ($nav/body/menu[@type='footer'])
- - development process URL is not included if maven.xdoc.developmentProcessUrl is empty
- - xhtml fix: missing "alt" attribute for images (required in xhtml) is added automatically
- - Document maven.xdoc.jsl.
- - Evenly space breadcrumbs, customize separator.
- - Better timezone calcs
- - Fix bad docs entries for maven.docs.dest and maven.gen.docs.
- - Add details on date format.
- - Fix excess whitespace.
- - Fixed empty scm repository and issue tracking URL still being added
- to the project navigation.
-
-
-Note that this plugin has been tested with Maven 1.0 rc1.
-Using it with another version of Maven is at your own risk!
-
-You can install the plugin with Maven 1.0 rc1 or later using:
-maven -DgroupId=maven -DartifactId=maven-xdoc-plugin -Dversion=1.5 plugin:download
-
-You can download the plugin here:
-http://www.ibiblio.org/maven/maven/plugins/maven-xdoc-plugin-1.5.jar
-
-Have fun!
--dIon
\ No newline at end of file
diff --git a/xdoc/project.properties b/xdoc/project.properties
index d2fa705e..f5f2bac2 100644
--- a/xdoc/project.properties
+++ b/xdoc/project.properties
@@ -17,11 +17,5 @@
# -------------------------------------------------------------------
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
-maven.xdoc.date=left
-## maven.xdoc.version=${pom.currentVersion}
#maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
-maven.license.licenseFile=${basedir}/../LICENSE.txt
-maven.checkstyle.header.file=${basedir}/../LICENSE.txt
-maven.checkstyle.format = turbine
-maven.checkstyle.properties = ${basedir}/../checkstyle.xml
maven.junit.fork=yes
\ No newline at end of file
diff --git a/xdoc/project.xml b/xdoc/project.xml
index 3675f4f3..988dc487 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -45,6 +45,11 @@
1.6
MAVEN_XDOC_1_6
+
+ 1.7
+ 1.7
+ HEAD
+
@@ -69,8 +74,8 @@
Vincent Massol
vmassol
- vmassol@octo.com
- Octo Technology
+ vmassol@pivolis.com
+ Pivolis
Java Developer
diff --git a/xdoc/xdocs/navigation.xml b/xdoc/xdocs/navigation.xml
index a10c4d39..9acd0f6c 100644
--- a/xdoc/xdocs/navigation.xml
+++ b/xdoc/xdocs/navigation.xml
@@ -31,7 +31,8 @@