From 4860527ec8cdd124a24bfa8670b754860466d649 Mon Sep 17 00:00:00 2001 From: "Lincoln Baxter, III" Date: Wed, 4 Nov 2015 08:13:28 -0500 Subject: [PATCH] Attempt to fix release build --- .gitignore | 1 - config-prettyfaces/pom.xml | 1 - config-tuckey/pom.xml | 1 - documentation/src/main/asciidoc/master.asciidoc | 2 +- pom.xml | 9 +++++++++ transform-minify/pom.xml | 3 +-- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f126d8723..5afc1da53 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .project .settings .DS_Store -dependency-reduced-pom.xml target/ *.iml *.ipr diff --git a/config-prettyfaces/pom.xml b/config-prettyfaces/pom.xml index d5a6098df..90c592f6a 100644 --- a/config-prettyfaces/pom.xml +++ b/config-prettyfaces/pom.xml @@ -113,7 +113,6 @@ org.apache.maven.plugins maven-shade-plugin - 1.6 package diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml index eb9175fd7..33704c39c 100644 --- a/config-tuckey/pom.xml +++ b/config-tuckey/pom.xml @@ -42,7 +42,6 @@ maven-shade-plugin - 1.4 package diff --git a/documentation/src/main/asciidoc/master.asciidoc b/documentation/src/main/asciidoc/master.asciidoc index 2afdeef21..c59ab2f3c 100644 --- a/documentation/src/main/asciidoc/master.asciidoc +++ b/documentation/src/main/asciidoc/master.asciidoc @@ -8,7 +8,7 @@ toc::[] include::index.asciidoc[] -include::install.asciidoc[] +include::configuration/install.asciidoc[] include::configuration/index.asciidoc[] diff --git a/pom.xml b/pom.xml index 0a64d40ba..8bf13ba47 100644 --- a/pom.xml +++ b/pom.xml @@ -83,14 +83,23 @@ + + org.apache.maven.plugins + maven-shade-plugin + 2.4.2 + org.apache.maven.plugins maven-release-plugin + 2.5.3 true true @{project.version} false + + dependency-reduced-pom.xml + diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml index d0857bb28..a7fd81704 100644 --- a/transform-minify/pom.xml +++ b/transform-minify/pom.xml @@ -59,7 +59,6 @@ org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -104,4 +103,4 @@ - \ No newline at end of file +