updated parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk@1766269 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-decoration-model/pom.xml b/doxia-decoration-model/pom.xml
index cddf8e4..d0d2703 100644
--- a/doxia-decoration-model/pom.xml
+++ b/doxia-decoration-model/pom.xml
@@ -33,7 +33,6 @@
<name>Doxia :: Decoration Model</name>
<description>The Decoration Model handles the decoration descriptor for sites, also known as site.xml.</description>
- <url>http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/</url>
<dependencies>
<dependency>
diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index 179c07b..7724b85 100644
--- a/doxia-doc-renderer/pom.xml
+++ b/doxia-doc-renderer/pom.xml
@@ -33,7 +33,6 @@
<name>Doxia :: Document Renderer</name>
<description>The Document Renderer handles the rendering of documents, in formats like PDF and RTF.</description>
- <url>http://maven.apache.org/doxia/doxia-sitetools/doxia-doc-renderer/</url>
<dependencies>
<!-- doxia -->
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index ca126db..f190bdb 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -33,7 +33,6 @@
<name>Doxia :: Site Renderer</name>
<description>The Site Renderer handles the rendering of sites, merging site decoration with document content.</description>
- <url>http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/</url>
<dependencies>
diff --git a/pom.xml b/pom.xml
index cc0b7a5..9545f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>27</version>
+ <version>30</version>
<relativePath>../../pom/maven/pom.xml</relativePath>
</parent>
@@ -36,7 +36,7 @@
<name>Doxia :: Sitetools</name>
<description>Doxia Sitetools generates sites, consisting of static and dynamic content that was generated by Doxia.</description>
- <url>http://maven.apache.org/doxia/doxia-sitetools/</url>
+ <url>https://maven.apache.org/doxia/doxia-sitetools/</url>
<inceptionYear>2005</inceptionYear>
<prerequisites>
@@ -185,28 +185,6 @@
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.5</maxJdkVersion>
- <excludes>
- <exclude>org.apache.xmlgraphics:*</exclude>
- </excludes>
- </enforceBytecodeVersion>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
@@ -288,6 +266,33 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ </enforceBytecodeVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>extra-enforcer-rules</artifactId>
+ <version>1.0-beta-6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
diff --git a/src/site/site.xml b/src/site/site.xml
index b8b7aac..db67659 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -21,28 +21,19 @@
*/
-->
-<project name="Doxia Sitetools" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project name="Doxia Sitetools" xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">
<bannerRight>
<name>Doxia</name>
- <src>http://maven.apache.org/doxia/images/doxia-logo.png</src>
- <href>http://maven.apache.org/doxia/</href>
+ <src>https://maven.apache.org/doxia/images/doxia-logo.png</src>
+ <href>https://maven.apache.org/doxia/</href>
</bannerRight>
<body>
- <head>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
- </script>
- <script type="text/javascript">
- _uacct = "UA-140879-1";
- urchinTracker();
- </script>
- </head>
-
<breadcrumbs>
- <item name="Doxia" href="http://maven.apache.org/doxia/index.html" />
- <item name="Doxia Sitetools" href="http://maven.apache.org/doxia/doxia-sitetools/index.html" />
+ <item name="Doxia" href="https://maven.apache.org/doxia/index.html" />
+ <item name="Doxia Sitetools" href="https://maven.apache.org/doxia/doxia-sitetools/index.html" />
</breadcrumbs>
<menu name="Overview">