Attempt to fix release build

ocpsoft · Nov 5, 2015 · 4860527 · 4860527
1 parent 2f46c9a
commit 4860527
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -113,7 +113,6 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>1.6</version>
             <executions>
                <execution>
                   <phase>package</phase>

diff --git a/config-tuckey/pom.xml b/config-tuckey/pom.xml
@@ -42,7 +42,6 @@
       <plugins>
          <plugin>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>1.4</version>
             <executions>
                <execution>
                   <phase>package</phase>

diff --git 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
@@ -83,14 +83,23 @@
 
    <build>
       <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <version>2.4.2</version>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-release-plugin</artifactId>
+            <version>2.5.3</version>
             <configuration>
                <localCheckout>true</localCheckout>
                <autoVersionSubmodules>true</autoVersionSubmodules>
                <tagNameFormat>@{project.version}</tagNameFormat>
                <pushChanges>false</pushChanges>
+               <checkModificationExcludes>
+                  <checkModificationExclude>dependency-reduced-pom.xml</checkModificationExclude>
+               </checkModificationExcludes>
             </configuration>
          </plugin>
       </plugins>

diff --git a/transform-minify/pom.xml b/transform-minify/pom.xml
@@ -59,7 +59,6 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>1.6</version>
             <executions>
                <execution>
                   <phase>package</phase>
@@ -104,4 +103,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>