From 80cef743dc7b8ddf4d789ad01cabbb9a0616b62b Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 12 Jun 2017 18:29:06 -0400
Subject: [PATCH] =?UTF-8?q?[MENFORCER-272]=20Site=20fixes.=20=C2=B7=20Gram?=
 =?UTF-8?q?mar=20error.=20=C2=B7=20Pick=20up=20fix=20of=20https://github.c?=
 =?UTF-8?q?om/mojohaus/extra-enforcer-rules/issues/13.=20=C2=B7=20Fix=20Ja?=
 =?UTF-8?q?vadoc=20error=20considered=20fatal=20by=20JDK=208.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maven/plugins/enforcer/BannedDependencies.java  |  2 +-
 enforcer-rules/src/site/apt/index.apt               |  2 +-
 pom.xml                                             | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
index 4151bf0c..36b2bd9f 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
@@ -199,7 +199,7 @@ public List<String> getIncludes()
      * Includes override the exclude rules. It is meant to allow wide exclusion rules with 
      * wildcards and still allow a
      * smaller set of includes. <br>
-     * For example, to ban all xerces except xerces-api -> exclude "xerces", 
+     * For example, to ban all xerces except xerces-api → exclude "xerces",
      * include "xerces:xerces-api"
      * 
      * @see #setIncludes(List)
diff --git a/enforcer-rules/src/site/apt/index.apt b/enforcer-rules/src/site/apt/index.apt
index e3c0a706..b48eb225 100644
--- a/enforcer-rules/src/site/apt/index.apt
+++ b/enforcer-rules/src/site/apt/index.apt
@@ -83,7 +83,7 @@ Standard Rules
 
   * {{{./requireSameVersions.html}requireSameVersions}} - enforces that specific dependencies and/or plugins have the same version.
 
-  * {{{./requireUpperBoundDeps.html}requireUpperBoundDeps}} - ensures that every (transitive) dependency is resolved to it's specified version or higher.
+  * {{{./requireUpperBoundDeps.html}requireUpperBoundDeps}} - ensures that every (transitive) dependency is resolved to its specified version or higher.
 
   []
 
diff --git a/pom.xml b/pom.xml
index cff3b8ac..5b53c383 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,6 +187,19 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin> <!-- TODO overriding 1.0-beta-3 from maven-parent-30.pom which fails with https://github.com/mojohaus/extra-enforcer-rules/issues/13 -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>extra-enforcer-rules</artifactId>
+            <version>1.0-beta-6</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
   </build>
 
   <reporting>