Merge branch 'master' into 7.0.x

This commit is contained in:
Clément Fournier
2020-01-17 16:09:45 +01:00
39 changed files with 604 additions and 234 deletions

View File

@@ -12,7 +12,7 @@
</parent>
<properties>
<apex.jorje.version>2019-01-18-a041d7</apex.jorje.version>
<apex.jorje.version>2019-11-07-964d4a</apex.jorje.version>
</properties>
<build>

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>apex</groupId>
<artifactId>apex-jorje-lsp-minimized</artifactId>
<version>2019-01-18-a041d7</version>
<version>2019-11-07-964d4a</version>
<description>POM was created from install:install-file</description>
</project>

View File

@@ -3,10 +3,10 @@
<groupId>apex</groupId>
<artifactId>apex-jorje-lsp-minimized</artifactId>
<versioning>
<release>2019-01-18-a041d7</release>
<release>2019-11-07-964d4a</release>
<versions>
<version>2019-01-18-a041d7</version>
<version>2019-11-07-964d4a</version>
</versions>
<lastUpdated>20190118084525</lastUpdated>
<lastUpdated>20200117105703</lastUpdated>
</versioning>
</metadata>