projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7a08032
)
Update compiler used by Maven, in order to support Java 11 compilation.
author
Mathieu Baudier <mbaudier@argeo.org>
Fri, 22 Nov 2019 09:42:46 +0000
(10:42 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Fri, 22 Nov 2019 09:42:46 +0000
(10:42 +0100)
pom.xml
patch
|
blob
|
history
diff --git
a/pom.xml
b/pom.xml
index 44c19d10b18f65388baaff6299a9997479c63f01..e86d2c678680409bfabdf534a3b2aa47bf4f5a07 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-1,5
+1,7
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
@@
-137,9
+139,10
@@
limitations under the License.
<!-- Maven -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<!-- Maven -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.
3
</version>
+ <version>3.
8.1
</version>
<configuration>
<source>1.8</source>
<configuration>
<source>1.8</source>
+<!-- <source>11</source> -->
<target>1.8</target>
<compilerId>eclipse</compilerId>
<!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
<target>1.8</target>
<compilerId>eclipse</compilerId>
<!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
@@
-152,7
+155,12
@@
limitations under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.6</version>
+ <version>2.8.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.19.0</version>
</dependency>
</dependencies>
</plugin>
</dependency>
</dependencies>
</plugin>
@@
-550,8
+558,10
@@
limitations under the License.
</goals>
<configuration>
<target>
</goals>
<configuration>
<target>
- <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
- <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+ <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+ failonerror="false">
+ <fileset dir="${project.build.directory}/rpm"
+ includes="*/RPMS/**/*.rpm" />
<flattenmapper />
</copy>
</target>
<flattenmapper />
</copy>
</target>
@@
-576,8
+586,10
@@
limitations under the License.
</goals>
<configuration>
<target>
</goals>
<configuration>
<target>
- <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
- <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+ <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+ failonerror="false">
+ <fileset dir="${project.build.directory}/rpm"
+ includes="*/RPMS/**/*.rpm" />
<flattenmapper />
</copy>
</target>
<flattenmapper />
</copy>
</target>