chore: new version "1.5.6"

aditosoftware · Sep 6, 2021 · d3c0ce3 · d3c0ce3
1 parent 27b318a
commit d3c0ce3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.5.5</version>
+    <version>1.5.6</version>
   </parent>
 
   <artifactId>api</artifactId>

diff --git a/gui/pom.xml b/gui/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.5.5</version>
+    <version>1.5.6</version>
   </parent>
 
   <artifactId>gui</artifactId>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.5.5</version>
+    <version>1.5.6</version>
   </parent>
 
   <artifactId>impl</artifactId>

diff --git a/nbm/pom.xml b/nbm/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.5.5</version>
+    <version>1.5.6</version>
   </parent>
 
   <packaging>nbm</packaging>

diff --git a/nbm/src/nbm/manifest.mf b/nbm/src/nbm/manifest.mf
@@ -6,6 +6,14 @@ OpenIDE-Module-Name: Git
 OpenIDE-Module-Display-Category: ADITO / VCS
 OpenIDE-Module-Long-Description: Git Support for NetBeans IDE.
   <p style="font-weight: bold;">Changelog</p>
+  <p style="font-weight: bold;">v1.5.6</p>
+  <p style="margin-left: 10px; font-weight: bold;">BUGFIXES</p>
+  <ul>
+    <li>Fix: The commit dialog after a merge conflict resolution does not properly commit the files</li>
+    <li>Fix: When exiting a conflict resolution dialog with changes still in place the file is not properly marked as resolved</li>
+    <li>Fix: Do not allow remote names containing spaces</li>
+    <li>Fix: Prevent possible deadlock during project opening</li>
+  </ul>
   <p style="font-weight: bold;">v1.5.5</p>
   <p style="margin-left: 10px; font-weight: bold;">MINOR</p>
   <ul>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>de.adito.git</groupId>
   <artifactId>adito-nb-git</artifactId>
   <packaging>pom</packaging>
-  <version>1.5.5</version>
+  <version>1.5.6</version>
 
   <properties>
     <netbeans.version>RELEASE111</netbeans.version>