v.1.5.1

aditosoftware · Feb 12, 2021 · ade81fb · ade81fb
1 parent 445ebf9
commit ade81fb
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 6 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.0</version>
+    <version>1.5.1</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.0</version>
+    <version>1.5.1</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.0</version>
+    <version>1.5.1</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.0</version>
+    <version>1.5.1</version>
   </parent>
 
   <packaging>nbm</packaging>

diff --git a/nbm/src/main/resources/META-INF/adito.version b/nbm/src/main/resources/META-INF/adito.version
@@ -1 +1 @@
-2020.2.1
+2020.2.2
diff --git a/nbm/src/nbm/manifest.mf b/nbm/src/nbm/manifest.mf
@@ -6,6 +6,26 @@ 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;">v.1.5.1</p>
+  <p style="margin-left: 10px; font-weight: bold;">MAJOR</p>
+  <ul>
+    <li>Added the "Renormalize" functionality: This action makes it so all files have the lineending in the index that is determined by the gitattributes file. If a file has the wrong lineending in the index, just changing a line and committing does not fix that issue</li>
+  </ul>
+  <p style="margin-left: 10px; font-weight: bold;">MINOR</p>
+  <ul>
+    <li>Branches with unrelated histories may now be merged</li>
+    <li>The plugin can now resolve conflicts where one side encloses the other</li>
+    <li>It is now possible to remove remotes from the Config Dialog. The remotes are also only written to disk upon pressing the Save button instead of immediately after adding the remote</li>
+  </ul>
+  <p style="margin-left: 10px; font-weight: bold;">BUGFIXES</p>
+  <ul>
+    <li>Fix: The location of the ssh key to use and its passphrase is asked more than once when checking out a project via git</li>
+    <li>Fix: If a wrong passphrase for a ssh key is stored, it does not get overriden when the user inserts the correct passphrase</li>
+    <li>Fix: The merge conflict dialogs no longer ignore the setting for the newline treatment</li>
+    <li>Fix: Potential Nullpointer when working with detached branches</li>
+    <li>Fix: The "Resolve Conflicts" action does not try and resolve the first file in the list</li>
+    <li>Fix: Error when retrieving the realm name for github addresses</li>
+  </ul>
   <p style="font-weight: bold;">v.1.5.0</p>
   <p style="margin-left: 10px; font-weight: bold;">MAJOR</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.0</version>
+  <version>1.5.1</version>
 
   <properties>
     <netbeans.version>RELEASE90a</netbeans.version>