diff --git a/pom.xml b/pom.xml index 55798be04fe0e7c6b270ad76f4a4a1fa0881977d..566f14d12874df100323d98aba0ffc7e97420f50 100644 --- a/pom.xml +++ b/pom.xml @@ -283,6 +283,13 @@ values --> <filtering>false</filtering> </resource> + <!-- TODO: RH: include static to react on changes during devel, target not working! + <resource> + <directory>src/main/webapp/static</directory> + <targetPath>${project.build.directory}/static</targetPath> + <filtering>false</filtering> + </resource> + --> </resources> <plugins> <plugin> @@ -388,6 +395,11 @@ <type>1</type> <location>${basedir}/olat.local.properties</location> </linkedResource> + <linkedResource> + <name>/src/main/java/maven.build.properties</name> + <type>1</type> + <location>${basedir}/target/${artifactId}-${project.version}/WEB-INF/classes/maven.build.properties</location> + </linkedResource> </linkedResources> @@ -413,7 +425,7 @@ <version>2.5</version> <configuration> <testFailureIgnore>true</testFailureIgnore> - <skipTests>true</skipTests> + <skipTests>${skipTests}</skipTests> <excludes> <!-- TODO:gs --> <exclude>**/TestTable.java</exclude> diff --git a/src/main/templates/maven.build.properties b/src/main/templates/maven.build.properties index 72ee359767a8780a96ea3b1553c6259aec4fd063..f3c76a8497168d9e8193916370ac11cd5e945c3f 100644 --- a/src/main/templates/maven.build.properties +++ b/src/main/templates/maven.build.properties @@ -1,2 +1,3 @@ project.build.home.directory=${basedir} -build.version=${version} \ No newline at end of file +build.version=${version} +skipTests=true \ No newline at end of file