Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[examples] Add the version of the maven-compiler-plugin in the pom te…
…mplate.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
  • Loading branch information
gallandarakhneorg committed Aug 22, 2018
1 parent 18e270d commit b0724d8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
2 changes: 2 additions & 0 deletions contribs/io.sarl.examples/io.sarl.examples.plugin/build.xml
Expand Up @@ -46,6 +46,7 @@
<filter token="FILE_ENCODING" value="UTF-8"/>
<filter token="JAVA_VERSION" value="1.8"/>
<filter token="RELEASE_YEAR" value="2018"/>
<filter token="MAVEN_COMPILER_VERSION" value="3.6.2"/>
</filterset>
</copy>
<copy file="@{pomtemplate}" tofile="@{archive}/@{name}/pom.xml" overwrite="false"
Expand All @@ -58,6 +59,7 @@
<filter token="FILE_ENCODING" value="UTF-8"/>
<filter token="JAVA_VERSION" value="1.8"/>
<filter token="RELEASE_YEAR" value="2018"/>
<filter token="MAVEN_COMPILER_VERSION" value="3.6.2"/>
</filterset>
</copy>
<delete file="@{target}/@{name}.zip" />
Expand Down
4 changes: 4 additions & 0 deletions contribs/io.sarl.examples/io.sarl.examples.plugin/pom.xml
Expand Up @@ -125,6 +125,10 @@
<token>%pomtemplatefile%</token>
<value>${path_to_pom_template_jar}</value>
</replacement>
<replacement>
<token>%mavencompilerversion%</token>
<value>${mavencompiler.version}</value>
</replacement>
</replacements>
</configuration>
</execution>
Expand Down
Expand Up @@ -46,6 +46,7 @@
<filter token="FILE_ENCODING" value="%encoding%"/>
<filter token="JAVA_VERSION" value="%compilerlevel%"/>
<filter token="RELEASE_YEAR" value="%releaseyear%"/>
<filter token="MAVEN_COMPILER_VERSION" value="%mavencompilerversion%"/>
</filterset>
</copy>
<copy file="@{pomtemplate}" tofile="@{archive}/@{name}/pom.xml" overwrite="false"
Expand All @@ -58,6 +59,7 @@
<filter token="FILE_ENCODING" value="%encoding%"/>
<filter token="JAVA_VERSION" value="%compilerlevel%"/>
<filter token="RELEASE_YEAR" value="%releaseyear%"/>
<filter token="MAVEN_COMPILER_VERSION" value="%mavencompilerversion%"/>
</filterset>
</copy>
<delete file="@{target}/@{name}.zip" />
Expand Down
6 changes: 4 additions & 2 deletions pom.xml
Expand Up @@ -75,6 +75,9 @@
<!-- Maven API version. This version should be supported by m2e. Search
for maven-core on central. -->
<maven.api.version>3.5.3</maven.api.version>
<!-- Version of the Maven Java compiler.
Version 3.7.0 depends on a library that is compiled with Java 9! -->
<mavencompiler.version>3.6.2</mavencompiler.version>
<!-- String to put after the copyright sign -->
<copyrighters>the original authors or authors</copyrighters>
<!-- URL of the Maven repositories of SARL (use in POM and documentation) -->
Expand Down Expand Up @@ -459,8 +462,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<!-- Version 3.7.0 depends on a library that is compiled with Java 9! -->
<version>3.6.2</version>
<version>${mavencompiler.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit b0724d8

Please sign in to comment.