[Git][ultreiaio/ird-observe][develop] 3 commits: optimize dependencies

7 Nov 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
348e3cbe by Tony CHEMIT at 2017-11-07T12:34:25+01:00
optimize dependencies

- - - - -
5bbc16e1 by Tony CHEMIT at 2017-11-07T12:34:42+01:00
use last pom

- - - - -
11c7bd22 by Tony CHEMIT at 2017-11-07T12:35:53+01:00
Fix jobs for tag

- - - - -


3 changed files:

- .gitlab-ci.yml
- client/pom.xml
- pom.xml


Changes:

=====================================
.gitlab-ci.yml
=====================================

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@
     - develop
 .only_tag: &only_tag
   only:
-    - tag
+    - tags
 .only_triggers: &only_triggers
   only:
     - triggers
@@ -36,7 +36,7 @@
 
 .publish-site: &publish_site
   script:
-    - ultreiaio-site-mono-module-publish
+    - ultreiaio-site-publish
 
 image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:latest
 stages:
@@ -96,18 +96,18 @@ release:
     - ultreiaio-milestone-create
 
 staging-demo:
-  <<: *stage_staging
+  <<: *stage_build
   <<: *env_staging
   <<: *only_tag
   script:
     - ultreiaio-war-deploy-to-demo 'server'
 
 staging-site:
-  <<: *stage_staging
+  <<: *stage_build
   <<: *env_staging
   <<: *only_tag
   script:
-    - ultreiaio-site-mono-module-publish
+    - ultreiaio-site-publish
 
 stage-release:
   <<: *stage_staging
@@ -132,7 +132,7 @@ latest-site:
   <<: *only_develop
   when: manual
   script:
-    - ultreiaio-site-mono-module-publish
+    - ultreiaio-site-publish
 
 latest-demo:
   <<: *stage_test


=====================================
client/pom.xml
=====================================
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -565,12 +565,6 @@
       <artifactId>h2</artifactId>
     </dependency>
 
-    <!-- FreeMarker -->
-    <dependency>
-      <groupId>org.freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-    </dependency>
-
     <!-- Map -->
     <dependency>
       <groupId>org.geotools</groupId>


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2017.36</version>
+    <version>2017.38</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
@@ -153,8 +153,8 @@
     <buildDate>${maven.build.timestamp}</buildDate>
 
     <observeToolkitVersion>1.7-SNAPSHOT</observeToolkitVersion>
-    <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion>
-    <processorPluginVersion>1.3</processorPluginVersion>
+    <plugin.version.eugene>3.0-alpha-16</plugin.version.eugene>
+    <plugin.version.processor>1.3</plugin.version.processor>
 
     <jaxx.version>3.0-alpha-17</jaxx.version>
     <i18n.version>4.0-alpha-7-SNAPSHOT</i18n.version>
@@ -174,12 +174,11 @@
     <webmotionVersion>2.5.3</webmotionVersion>
     <httpComponentsVersion>4.5.3</httpComponentsVersion>
     <geoToolsVersion>17.2</geoToolsVersion>
-    <guavaVersion>23.2-jre</guavaVersion>
+    <guavaVersion>23.3-jre</guavaVersion>
 
     <!-- license header configuration -->
     <license.licenseName>gpl_v3</license.licenseName>
     <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>
-    <license.excludes>**/ftl/*.ftl,**/i18n/*.properties,**/THIRD-PARTY.properties,**/*.sh,**/*.json</license.excludes>
 
     <!-- i18n configuration -->
     <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>
@@ -598,13 +597,6 @@
         </exclusions>
       </dependency>
 
-      <!-- FreeMarker -->
-      <dependency>
-        <groupId>org.freemarker</groupId>
-        <artifactId>freemarker</artifactId>
-        <version>2.3.23</version>
-      </dependency>
-
       <!-- db -->
       <dependency>
         <groupId>com.h2database</groupId>
@@ -867,7 +859,7 @@
         <plugin>
           <groupId>io.ultreia.java4all.eugene</groupId>
           <artifactId>eugene-maven-plugin</artifactId>
-          <version>${eugenePluginVersion}</version>
+          <version>${plugin.version.eugene}</version>
         </plugin>
 
         <plugin>
@@ -951,7 +943,7 @@
 
           <plugin>
             <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>${projectInfoReportsPluginVersion}</version>
+            <version>${plugin.version.projectInfoReports}</version>
             <inherited>false</inherited>
             <reportSets>
               <reportSet>
@@ -976,7 +968,7 @@
 
           <plugin>
             <artifactId>maven-changes-plugin</artifactId>
-            <version>${changesPluginVersion}</version>
+            <version>${plugin.version.changes}</version>
             <inherited>false</inherited>
             <configuration>
               <issueLinkTemplatePerSystem>
@@ -995,21 +987,21 @@
 
           <plugin>
             <artifactId>maven-changelog-plugin</artifactId>
-            <version>${changelogPluginVersion}</version>
+            <version>${plugin.version.changelog}</version>
             <inherited>false</inherited>
           </plugin>
 
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>license-maven-plugin</artifactId>
-            <version>${licensePluginVersion}</version>
+            <version>${plugin.version.license}</version>
             <inherited>false</inherited>
           </plugin>
 
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>versions-maven-plugin</artifactId>
-            <version>${versionsPluginVersion}</version>
+            <version>${plugin.version.versions}</version>
             <inherited>false</inherited>
             <reportSets>
               <reportSet>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/763dfec36cec52816cbd59608f9...

---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/763dfec36cec52816cbd59608f9...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)