diff --git a/.gitignore b/.gitignore
index 15c7af78fb18fcab701883e1756ef7c488c14ea3..5e6c19ca7b9e1f731c7c51e5215203aa7ec4bf91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,33 @@
+/bin/
+/target/
+/cargo/
+/.settings/
+
+# deprecated scripting files
+*.pl
+*.php
+
+# editor backup files
+*~
+*.bak
+*.swp
+
+# sundry useless files
+*.out
+mvn*.log
+
+# Mac idiosyncrasies
+.DS_Store
+
+#ignore project/.classpath file at this gets created by maven
+.classpath
+.project
+src/main/java/olat.local.properties
+
 .classpath
 /.project
 /.settings
 */target
 *.sw?
 */.classpath
-*/.project
-*/.settings/*
-*/.settings/org.eclipse.core.resources.prefs
-*/.settings/org.eclipse.wst.common.component
-*/.settings/org.eclipse.wst.common.project.facet.core.xml
-*/.settings/org.eclipse.jdt.core.prefs
-*/.settings/org.eclipse.m2e.core.prefs
-*/.settings/org.eclipse.wst.jsdt.ui.*
-*/.settings/org.sonarlint.*
-*/.settings/.jsdtscope
\ No newline at end of file
+*/.project
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f6d5fd571f41579d66cff39bb2c0caa38ed662d4..79056ec0604a296df55e403d0eb6bb74407c7838 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1247,22 +1247,22 @@
 			</testResource>
 		</testResources>
 		<plugins>
-			<!-- Set the build number from mercurial -->
+			<!-- Set the build number from git -->
 			<plugin>
-				<groupId>org.openolat.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.2.0</version>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>2.2.4</version>
 				<executions>
 					<execution>
-						<phase>validate</phase>
+						<id>get-the-git-infos</id>
 						<goals>
-							<goal>hgchangeset</goal>
+							<goal>revision</goal>
 						</goals>
+						<phase>validate</phase>
 					</execution>
 				</executions>
 				<configuration>
-					<doCheck>true</doCheck>
-					<doUpdate>true</doUpdate>
+					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -1394,9 +1394,9 @@
 								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 							</manifest>
 							<manifestEntries>
-								<Build-Change-Set>${changeSet}</Build-Change-Set>
-								<Build-Change-Set-Date>${changeSetDate}</Build-Change-Set-Date>
-								<Build-Revision-Number>${revisionNumber}</Build-Revision-Number>
+								<Build-Change-Set>${git.commit.id}</Build-Change-Set>
+								<Build-Change-Set-Date>${git.commit.time}</Build-Change-Set-Date>
+								<Build-Revision-Number>${git.commit.id.abbrev}</Build-Revision-Number>
 								<Implementation-Build>${buildNumber}</Implementation-Build>
 							</manifestEntries>
 						</archive>