projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use XSD instead of DTD in DocBook documentation.
[lgpl/argeo-commons.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index ca7c6e67bc3cc8f37eab6a18125c1ef06c63bb45..320a886db696ef6bf083ba20fabd8e701463e555 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>
@@
-8,8
+10,8
@@
<packaging>pom</packaging>
<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
<properties>
<packaging>pom</packaging>
<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
<properties>
- <version.argeo-commons>2.1.8
2
</version.argeo-commons>
- <version.argeo-tp>2.1.2
5
</version.argeo-tp>
+ <version.argeo-commons>2.1.8
3-SNAPSHOT
</version.argeo-commons>
+ <version.argeo-tp>2.1.2
7
</version.argeo-tp>
<!-- RPM -->
<argeo.rpm.release>7</argeo.rpm.release>
<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
<!-- RPM -->
<argeo.rpm.release>7</argeo.rpm.release>
<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@
-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>