GitLab

at 2017-03-20T08:21:23+01:00

update pom to 7

review site (deploy it now under gitlab.io)

 

 .deploy_site: &deploy_site

   script:

-    - mvn install -DskipTests

-    - mvn site-deploy -DperformRelease

+    - mvn verify site site:stage -DperformRelease

+    - mvn scm-publish:publish-scm

 

 .deploy_demo_latest: &deploy_demo_latest

   stage: Test

 # ObServe

 

 [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22fr.ird.observe%22%20AND%20a%3A%22observe%22)

-![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop-5.x/build.svg)

+![Build Status](https://gitlab.com/ultreiaio/ird-observe/badges/develop-5.x/build.svg)

 

 # Resources

 

-* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop-5.x/CHANGELOG.md)

-* [Documentation](http://observe.ultreia.io)

+* [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop-5.x/CHANGELOG.md)

+* [Documentation](http://ultreiaio.gitlab.io/observe)

 

 # Demo

 

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>4</version>

+    <version>9</version>

   </parent>

 

   <groupId>fr.ird.observe</groupId>

 

   <name>ObServe</name>

   <description>Projet ObServe</description>

-  <url>http://observe.ultreia.io</url>

+  <url>http://ultreiaio.gitlab.io/observe</url>

   <inceptionYear>2008</inceptionYear>

   <organization>

     <name>IRD</name>

     <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection>

   </scm>

 

-  <distributionManagement>

-    <site>

-      <id>doc.ultreia.io</id>

-    </site>

-  </distributionManagement>

-

   <properties>

 

-    <organizationId>ultreia.io</organizationId>

+    <organizationId>ultreiaio</organizationId>

     <projectId>ird-observe</projectId>

 

+    <!-- dev version (for develop purpose -->

+    <devMode>true</devMode>

+

+    <!--Modèle version-->

+    <observe.model.version>5.0</observe.model.version>

+

+    <!-- build timestamp configuration -->

+    <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>

+    <buildDate>${maven.build.timestamp}</buildDate>

+

+    <mavenVersion>3.3.9</mavenVersion>

+

     <gitlabPluginVersion>1.0.7</gitlabPluginVersion>

     <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>

     <processorPluginVersion>1.3</processorPluginVersion>

+    <licensePluginVersion>1.9</licensePluginVersion>

+

     <jaxxVersion>2.42</jaxxVersion>

     <nuitonI18nVersion>3.6.3</nuitonI18nVersion>

     <nuitonConfigVersion>3.2</nuitonConfigVersion>

     <sl4jVersion>1.7.23</sl4jVersion>

     <swingXVersion>1.6.5-1</swingXVersion>

     <reflectionsVersion>0.9.10</reflectionsVersion>

-

     <webmotionVersion>2.5.1</webmotionVersion>

     <httpComponentsVersion>4.5.3</httpComponentsVersion>

 

-    <licensePluginVersion>1.9</licensePluginVersion>

-

-    <mavenVersion>3.3.9</mavenVersion>

-

     <!-- license header configuration -->

     <license.licenseName>gpl_v3</license.licenseName>

     <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>

     <locales>fr</locales>

     <generateSitemap>true</generateSitemap>

     <relativizeDecorationLinks>false</relativizeDecorationLinks>

-    <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix>

 

     <!--Gitlab configuration-->

     <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle>

     <gitlab.changesAuthorEmail>dev@tchemit.fr</gitlab.changesAuthorEmail>

     <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers>

 

-    <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>

-    <buildDate>${maven.build.timestamp}</buildDate>

-    <devMode>true</devMode>

-

-    <!--Modèle version-->

-    <observe.model.version>5.0</observe.model.version>

-

+    <!--gitflow configuration-->

     <jgitflow.developBranchName>develop-5.x</jgitflow.developBranchName>

     <jgitflow.masterBranchName>master-5.x</jgitflow.masterBranchName>

 

   </properties>

 

-  <repositories>

-    <repository>

-      <id>before-central</id>

-      <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url>

-      <releases>

-        <enabled>true</enabled>

-        <checksumPolicy>fail</checksumPolicy>

-      </releases>

-    </repository>

-  </repositories>

-  <pluginRepositories>

-    <pluginRepository>

-      <id>before-central</id>

-      <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url>

-      <releases>

-        <enabled>true</enabled>

-        <checksumPolicy>fail</checksumPolicy>

-      </releases>

-    </pluginRepository>

-  </pluginRepositories>

   <dependencyManagement>

     <dependencies>

 

     <pluginManagement>

       <plugins>

 

-        <!-- plugin site -->

         <plugin>

           <artifactId>maven-site-plugin</artifactId>

           <dependencies>

         </plugin>

 

         <plugin>

+          <artifactId>maven-scm-publish-plugin</artifactId>

+          <configuration>

+            <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl>

+            <scmBranch>pages</scmBranch>

+            <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage -->

+          </configuration>

+          <executions>

+            <execution>

+              <id>scm-publish</id>

+              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->

+              <goals>

+                <goal>publish-scm</goal>

+              </goals>

+            </execution>

+          </executions>

+        </plugin>

+

+        <plugin>

           <groupId>org.codehaus.gmavenplus</groupId>

           <artifactId>gmavenplus-plugin</artifactId>

           <dependencies>

               <releaseArtifact>

                 <groupId>fr.ird.observe</groupId>

                 <artifactId>observe</artifactId>

-                <name>Application</name>

+                <name>Client</name>

                 <type>zip</type>

               </releaseArtifact>

               <releaseArtifact>

 

       </plugins>

     </pluginManagement>

-    <extensions>

-      <!-- Enabling the use of scpexe with maven 3.0 -->

-      <extension>

-        <groupId>org.apache.maven.wagon</groupId>

-        <artifactId>wagon-ssh-external</artifactId>

-        <version>1.0</version>

-      </extension>

-    </extensions>

   </build>

 

   <reporting>

           <plugin>

             <artifactId>maven-project-info-reports-plugin</artifactId>

             <version>${projectInfoReportsPluginVersion}</version>

+            <inherited>false</inherited>

             <reportSets>

               <reportSet>

                 <reports>

           <plugin>

             <artifactId>maven-changes-plugin</artifactId>

             <version>${changesPluginVersion}</version>

+            <inherited>false</inherited>

             <configuration>

               <issueLinkTemplatePerSystem>

-                <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab>

+                <gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab>

               </issueLinkTemplatePerSystem>

               <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath>

             </configuration>

+            <reportSets>

+              <reportSet>

+                <reports>

+                  <report>changes-report</report>

+                </reports>

+              </reportSet>

+            </reportSets>

           </plugin>

 

           <plugin>

             <artifactId>maven-changelog-plugin</artifactId>

             <version>${changelogPluginVersion}</version>

+            <inherited>false</inherited>

           </plugin>

 

           <plugin>

             <groupId>org.codehaus.mojo</groupId>

             <artifactId>license-maven-plugin</artifactId>

             <version>${licensePluginVersion}</version>

+            <inherited>false</inherited>

           </plugin>

 

           <plugin>

             <groupId>org.codehaus.mojo</groupId>

             <artifactId>versions-maven-plugin</artifactId>

             <version>${versionsPluginVersion}</version>

+            <inherited>false</inherited>

             <reportSets>

               <reportSet>

                 <reports>

             </executions>

           </plugin>

 

-          <plugin>

-            <groupId>org.nuiton</groupId>

-            <artifactId>helper-maven-plugin</artifactId>

-            <executions>

-              <execution>

-                <id>compute-distribution-site-url</id>

-                <goals>

-                  <goal>compute-distribution-site-url</goal>

-                </goals>

-                <phase>pre-site</phase>

-              </execution>

-            </executions>

-          </plugin>

-

         </plugins>

 

       </build>

 - une couche de Services

 - une couche de Persistance

 

-.. image:: images/architecture.png

-   :scale: 50

-   :align: center

+[Architecture](!./img/architecture.png)

 

 # La couche de Présentation

 

   -->

 

 <project name="${project.name}"

-         xmlns="http://maven.apache.org/DECORATION/1.4.0"

+         xmlns="http://maven.apache.org/DECORATION/1.7.0"

          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">

+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">

 

   <skin>

     <groupId>org.apache.maven.skins</groupId>

     <artifactId>maven-fluido-skin</artifactId>

-    <version>1.4</version>

+    <version>1.6</version>

   </skin>

 

   <custom>

 

   <bannerLeft>

     <name>${project.name}</name>

-    <src>${project.url}/${siteDeployClassifier}/images/logo-small.png</src>

+    <src>./img/logo-small.png</src>

     <href>index.html</href>

   </bannerLeft>

 

   <poweredBy>

-

-    <logo href="http://jaxx.nuiton.org" name="JAXX" width="120"

-          img="${project.url}/${siteDeployClassifier}/images/logos/jaxx-logo.png"/>

-    <logo href="http://topia.nuiton.org" name="ToPIA" width="120"

-          img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/>

-    <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120"

-          img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/>

-    <logo href="https://www.jetbrains.com/idea" name="IntelliJ" width="120"

-          img="${project.url}/${siteDeployClassifier}/images/logos/logo_IntelliJIDEA.png"/>

-

+    <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" img="./img/jaxx-logo.png"/>

+    <logo href="http://topia.nuiton.org" name="ToPIA" width="120" img="./img/topia-logo.png"/>

+    <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" img="./img/argouml-logo.png"/>

+    <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/>

   </poweredBy>

 

   <body>

 

-    <head>

-      <script type="text/javascript" src="site.js"> </script>

-      <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/>

-    </head>

-

     <links>

-      <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/>

+      <item name="GitLab" href="https://gitlab.com/ultreiaio/ird-observe"/>

       <item name="Ultreia.io" href="http://ultreia.io"/>

     </links>

 

     <breadcrumbs>

       <item name="${project.name}" href="${project.url}/index.html"/>

-      <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/>

     </breadcrumbs>

 

     <menu name="Utilisateur">

       <item name="Installation" href="install.html"/>

       <item name="Administration Obstuna" href="install-serverPG.html"/>

       <item name="Administration Web" href="administration-web.html"/>

-      <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/>

-      <item name="Historique des versions" href="https://gitlab.com/ultreia.io/observe/blob/e7881100e542f7fa62209d49edf845018b6c53c7/changelog.md"/>

+      <item name="Historique des versions" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md"/>

       <item name="Configuration" href="./config-report.html"/>

     </menu>

 

 

     <menu ref="reports"/>

 

-    <footer>

-      <div id='mavenProjectProperties' locale='fr'

-           projectId='${project.projectId}'

-           version='${project.siteDeployClassifier}'

-           sourcesType='md'

-           scmwebeditor_skipFiles=',config-report,'

-           scmwebeditor_vmFiles=",index,"/>

-    </footer>

-

   </body>

 </project>

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

Commits:

14 changed files:

Changes: