Update library that seems to not have breaking changes
Refs #3071 : correct the version of the maven artifact in rudder-parent-pom
Merge pull request #2 from ncharles/arc_3070/dev/3071_set_maven_version_to_2.4.1-snapshot

Refs #3071 : correct the version of the maven artifact in rudder-parent-pom
Merge branch 'branches/rudder/2.4.1'

Conflicts:
	pom.xml
Merge pull request #1 from fanf/arc_3003/3006_update_library_in_parent_pom

Refs #3003, fixes 3006: update library that seems to not have breaking changes
Fixes #3003 : set the dependencies to SLF4J to a newer minor version rather than newer version
Fixes #3003 : specs2 behaviour changed, making tests relying on SQL not working
Set pom.xml version to 2.4.1
Change pom.xml maven artifact to 2.4.2-SNAPSHOT
Merge branch 'branches/rudder/2.4' into branches/rudder/2.4.1

* branches/rudder/2.4:
  Set pom.xml version to 2.4.1

Conflicts:
	pom.xml
Merge branch 'branches/rudder/2.4.1'

* branches/rudder/2.4.1:
  Change pom.xml maven artifact to 2.4.2-SNAPSHOT
  Set pom.xml version to 2.4.1

Conflicts:
	pom.xml
Refs #3096 : change the versionning of scala-ldap to follow Rudder's
Change version of pom.xml from 2.4.2-SNAPSHOT to 2.4.2
Merge pull request #3 from ncharles/arc_3096/dev/3096_normalize_versionning_of_scala_ldap

Refs #3096 : change the versionning of scala-ldap to follow Rudder's
Merging 2.4 into 2.5
Refs #3163: change pom version
Merging 2.4 to 2.5
Refs #3166: correct the artefact version on branch master
Last change in pom.xml (set rudder version to 2.6.0-SNAPSHOT)
Issue #3166: missing updated dependency to 2.6.0-SNAPSHOT