diff --git a/.hgignore b/.hgignore index 67a7fe6737deccf308233c1159140fa4a5bfecf9..c4b9b940da6d94767ff6af6d9b044bc199bb9fa1 100644 --- a/.hgignore +++ b/.hgignore @@ -42,10 +42,7 @@ CVS/* #ignore olat/.classpath file at this gets created by maven .classpath .project -.settings/org.eclipse.jdt.core.prefs -.settings/org.eclipse.wst.common.component -.settings/org.eclipse.wst.common.project.facet.core.xml -.settings/org.maven.ide.eclipse.prefs +.settings/* src/main/resources/maven.build.properties src/main/java/maven.build.properties diff --git a/pom.xml b/pom.xml index 050b09b657d70f448808496fc2a974aee29592bc..982d43b4d79efe0e92851c0e80c7ded835cb3d42 100644 --- a/pom.xml +++ b/pom.xml @@ -1472,6 +1472,15 @@ <!-- context name for servlet container e.g. localhost:8080/olat --> <wtpContextName>olat</wtpContextName> <downloadSources>false</downloadSources> + <additionalConfig> + <file> + <name>.settings/org.eclipse.core.resources.prefs</name> + <content> + <![CDATA[eclipse.preferences.version=1 + encoding/<project>=UTF-8]]> + </content> + </file> + </additionalConfig> </configuration> </plugin>