Update version to 1.7.6

samaxes · Nov 29, 2016 · c807f7d · c807f7d
1 parent 41ad286
commit c807f7d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Minify Maven Plugin
 
+## 1.7.6
+
+* `<skipMerge>true</skipMerge>` overwrites same file multiple times (#130, #131, #132).
+
 ## 1.7.5
 
 * Add support for external bundle configuration (#57).

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Configure your project's `pom.xml` to run the plugin during the project's build
     <plugin>
       <groupId>com.samaxes.maven</groupId>
       <artifactId>minify-maven-plugin</artifactId>
-      <version>1.7.5</version>
+      <version>1.7.6</version>
       <executions>
         <execution>
           <id>default-minify</id>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.samaxes.maven</groupId>
     <artifactId>minify-maven-plugin-demo</artifactId>
-    <version>1.7.5</version>
+    <version>1.7.6</version>
     <packaging>war</packaging>
 
     <name>Minify Maven Plugin Demo</name>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.samaxes.maven</groupId>
     <artifactId>minify-maven-plugin</artifactId>
-    <version>1.7.5</version>
+    <version>1.7.6-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>Minify Maven Plugin</name>
@@ -43,8 +43,8 @@
         <connection>scm:git:https://github.com/samaxes/minify-maven-plugin.git</connection>
         <developerConnection>scm:git:[email protected]:samaxes/minify-maven-plugin.git</developerConnection>
         <url>https://github.com/samaxes/minify-maven-plugin</url>
-      <tag>minify-maven-plugin-1.7.5</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
     <issueManagement>
         <system>GitHub</system>
         <url>https://github.com/samaxes/minify-maven-plugin/issues</url>

diff --git a/src/site/apt/examples/basic.apt b/src/site/apt/examples/basic.apt
@@ -19,7 +19,7 @@ Basic Configuration
       <plugin>
         <groupId>com.samaxes.maven</groupId>
         <artifactId>minify-maven-plugin</artifactId>
-        <version>1.7.5</version>
+        <version>1.7.6</version>
         <executions>
           <execution>
             <id>default-minify</id>

diff --git a/src/site/apt/examples/bundle.apt b/src/site/apt/examples/bundle.apt
@@ -20,7 +20,7 @@ Bundle Configuration
       <plugin>
         <groupId>com.samaxes.maven</groupId>
         <artifactId>minify-maven-plugin</artifactId>
-        <version>1.7.5</version>
+        <version>1.7.6</version>
         <executions>
           <execution>
             <id>bundle-minify</id>

diff --git a/src/site/apt/examples/exclude.apt b/src/site/apt/examples/exclude.apt
@@ -31,7 +31,7 @@ Exclude source files from WAR package
       <plugin>
         <groupId>com.samaxes.maven</groupId>
         <artifactId>minify-maven-plugin</artifactId>
-        <version>1.7.5</version>
+        <version>1.7.6</version>
         <executions>
           <execution>
             <id>default-minify</id>

diff --git a/src/site/apt/examples/patterns.apt b/src/site/apt/examples/patterns.apt
@@ -19,7 +19,7 @@ Using include/exclude patterns
       <plugin>
         <groupId>com.samaxes.maven</groupId>
         <artifactId>minify-maven-plugin</artifactId>
-        <version>1.7.5</version>
+        <version>1.7.6</version>
         <executions>
           <execution>
             <id>default-minify</id>

diff --git a/src/site/apt/usage.apt b/src/site/apt/usage.apt
@@ -44,7 +44,7 @@ Usage
       <plugin>
         <groupId>com.samaxes.maven</groupId>
         <artifactId>minify-maven-plugin</artifactId>
-        <version>1.7.5</version>
+        <version>1.7.6</version>
         <executions>
           <execution>
             <id>default-minify</id>