diff --git a/duniter4j-elasticsearch/pom.xml b/duniter4j-elasticsearch/pom.xml index e5a49593ae441a8b22088006d56928ae089a6de0..295c1b18d408dddaa0bf0a62f299484414ffac61 100644 --- a/duniter4j-elasticsearch/pom.xml +++ b/duniter4j-elasticsearch/pom.xml @@ -218,13 +218,8 @@ <target> <!-- download cesium --> - <get src="${cesium.download.url}" - dest="${project.build.directory}/cesium-web-${cesium.version}.zip" - verbose="false" - usetimestamp="true"/> - <unzip src="${project.build.directory}/cesium-web-${cesium.version}.zip" - dest="${project.build.directory}/elasticsearch-${elasticsearch.version}/plugins/${project.artifactId}/_site" - overwrite="true"> + <get src="${cesium.download.url}" dest="${project.build.directory}/cesium-web-${cesium.version}.zip" verbose="false" usetimestamp="true" /> + <unzip src="${project.build.directory}/cesium-web-${cesium.version}.zip" dest="${project.build.directory}/elasticsearch-${elasticsearch.version}/plugins/${project.artifactId}/_site" overwrite="true"> </unzip> </target> <skip>${assembly.skip}</skip> @@ -311,10 +306,10 @@ <configuration> <target> <!--<chmod perm="ug+rw"> - <fileset dir="${es.home}/lib"/> + <fileset dir="${es.home}/lib" /> </chmod>--> <ac:if xmlns:ac="antlib:net.sf.antcontrib"> - <istrue value="${assembly.skip}"/> + <istrue value="${assembly.skip}" /> <then> <copy todir="${run.es.home}/plugins/${project.artifactId}"> <fileset dir="${project.build.directory}" includes="*.jar"> @@ -322,20 +317,17 @@ </copy> </then> <else> - <delete dir="${project.build.directory}/${bundlePrefix}"/> - <delete dir="${run.es.home}"/> + <delete dir="${project.build.directory}/${bundlePrefix}" /> + <delete dir="${run.es.home}" /> <!-- Unzip standalone zip--> - <unzip src="${project.build.directory}/${bundlePrefix}-standalone.zip" - dest="${project.build.directory}" - overwrite="true"> + <unzip src="${project.build.directory}/${bundlePrefix}-standalone.zip" dest="${project.build.directory}" overwrite="true"> </unzip> - <move file="${project.build.directory}/${bundlePrefix}" tofile="${run.es.home}"/> + <move file="${project.build.directory}/${bundlePrefix}" tofile="${run.es.home}" /> </else> </ac:if> <!-- Use files from src/test/es-home --> - <copy todir="${run.es.home}" - overwrite="true"> + <copy todir="${run.es.home}" overwrite="true"> <fileset dir="${project.basedir}/src/test/es-home" includes="**/*.*"> </fileset> </copy> diff --git a/pom.xml b/pom.xml index 7c8f9198aac2e326235a1f7b9cc28e14129b47f9..9f51a8ff111664a31350dc420bb8164aa0063496 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ <!-- release config --> <autoVersionSubmodules>true</autoVersionSubmodules> <goals>deploy</goals> - <arguments></arguments> + <arguments /> <preparationGoals>verify</preparationGoals> <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion> @@ -69,7 +69,7 @@ <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> <!-- Could be overriding in modules --> - <maven.jar.main.class/> + <maven.jar.main.class /> <!-- skip javadoc for now - FIXME fix java 8 javadoc errors --> <maven.javadoc.skip>true</maven.javadoc.skip> @@ -106,8 +106,8 @@ <scm> <url>https://github.com/duniter/duniter4j.git</url> - <connection>scm:svn:https://github.com/duniter/duniter4j.git</connection> - <developerConnection>scm:svn:https://github.com/duniter/duniter4j.git</developerConnection> + <connection>scm:git:https://github.com/duniter/duniter4j.git</connection> + <developerConnection>scm:git:https://github.com/duniter/duniter4j.git</developerConnection> </scm> <issueManagement>