Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 68f178ae by Tony CHEMIT at 2017-04-02T08:16:48+02:00 review site + align pom for next release - - - - - ee9cfe19 by Tony CHEMIT at 2017-04-02T08:21:15+02:00 review builds - - - - - 14 changed files: - .gitlab-ci.yml - pom.xml - src/site/markdown/install.md - src/site/markdown/installer.md.vm - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/logo-OT_web.png → src/site/resources/img/logo-OT_web.png - + src/site/resources/img/logo_IntelliJIDEA.png - src/site/resources/images/logos/logo_ird.png → src/site/resources/img/logo_ird.png - + src/site/resources/img/maven-feather.png - + src/site/resources/img/struts2-logo.png - src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png - − src/site/resources/site.js - src/site/site.xml - t3-installer/src/main/assembly/bin.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,6 @@ stages: - Production .before_script_default: &before_script_default - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - 'which zip || ( apt-get update -y && apt-get install zip -y )' @@ -22,13 +19,12 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL + - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) + - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - 'which zip || ( apt-get update -y && apt-get install zip -y )' @@ -36,13 +32,26 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env-with-clone.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL + - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) + - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + +.env_test: &env_test + environment: + name: test + +.env_staging: &env_staging + environment: + name: staging + +.env_production: &env_production + environment: + name: production .deploy_site: &deploy_site script: - - mvn install -DskipTests - - mvn site-deploy -DperformRelease + - mvn clean install site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test @@ -61,18 +70,6 @@ build: except: - triggers -.env_test: &env_test - environment: - name: test - -.env_staging: &env_staging - environment: - name: staging - -.env_production: &env_production - environment: - name: production - .test_manual: &test_manual stage: Test <<: *before_script_default @@ -87,7 +84,11 @@ stage: <<: *test_manual <<: *before_script_clone script: - - . ~/env/bin/stage.sh "$MASTER" "$DEVELOP" "$STAGE" + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -132,7 +133,7 @@ nightly-demo: staging-demo: <<: *staging script: - - mvn install -am -p t3-web -DskipTests -Pdeploy-demo -DperformRelease + - mvn install -am -pl t3-web -DskipTests -Pdeploy-demo -DperformRelease staging-site: <<: *staging @@ -142,7 +143,13 @@ release: <<: *staging when: manual script: - - . ~/env/bin/close_stage.sh "$STAGE" + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + +drop: + <<: *staging + when: manual + script: + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash production: stage: Production ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2</version> + <version>9</version> </parent> <groupId>fr.ird.t3</groupId> @@ -36,7 +36,7 @@ <name>T3</name> <description>Projet T3+</description> - <url>http://t3.ultreia.io</url> + <url>https://ultreiaio.gitlab.io/ird-t3</url> <inceptionYear>2010</inceptionYear> <organization> <name>IRD</name> @@ -84,31 +84,26 @@ </developerConnection> </scm--> <scm> - <url>https://gitlab.com/ultreia.io/ird-observe</url> - <connection>scm:git:git@gitlab.com:ultreia.io/ird-observe.git</connection> - <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> + <url>https://gitlab.com/ultreiaio/ird-t3</url> + <connection>scm:git:git@gitlab.com:ultreiaio/ird-t3.git</connection> + <developerConnection>scm:git:ssh://git@gitlab.com:ultreiaio/ird-t3.git</developerConnection> </scm> - <issueManagement> - <system>gitlab</system> - <url>https://gitlab.com/ultreia.io/ird-observe</url> - </issueManagement> <distributionManagement> <site> - <id>doc.ultreia.io</id> + <id>gitlab.com</id> + <url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url> </site> </distributionManagement> <properties> - <organizationId>ultreia.io</organizationId> + <organizationId>ultreiaio</organizationId> <projectId>ird-t3</projectId> <t3-data.version>1.1</t3-data.version> <!-- libraries version --> - <gitlabPluginVersion>1.0.4</gitlabPluginVersion> - <eugenePluginVersion>2.6.2</eugenePluginVersion> <topiaVersion>2.8.1.3</topiaVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> @@ -138,14 +133,12 @@ <locales>fr</locales> <generateSitemap>true</generateSitemap> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <siteSourcesType>md</siteSourcesType> - <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/t3</helper.distributionSiteUrlPrefix> <!--Gitlab configuration--> <gitlab.changesTitle>T3 changelog</gitlab.changesTitle> <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> <gitlab.changesAuthorEmail>dev@tchemit.fr</gitlab.changesAuthorEmail> - <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers> + <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> <commonsLang3Version>3.1</commonsLang3Version> @@ -520,6 +513,24 @@ </configuration> </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> + </plugins> </pluginManagement> @@ -662,19 +673,6 @@ </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> </profile> ===================================== src/site/markdown/install.md ===================================== --- a/src/site/markdown/install.md +++ b/src/site/markdown/install.md @@ -14,7 +14,7 @@ Elle se déroule en deux étapes : ## Récupération de l'application -Récupérez la dernière application depuis [la page des téléchargements](https://gitlab.com/ultreia.io/ird-t3/blob/develop/CHANGELOG.md). +Récupérez la dernière application depuis [la page des téléchargements](https://gitlab.com/ultreiaio/ird-t3/blob/develop/CHANGELOG.md). ## Préparation de la configuration ===================================== src/site/markdown/installer.md.vm ===================================== --- a/src/site/markdown/installer.md.vm +++ b/src/site/markdown/installer.md.vm @@ -7,7 +7,7 @@ Présentation de l'outil utilitaire pour installer une base T3+. ## Téléchargement L'installeur est disponible sous la forme d'une archive zip (**t3-xxx.zip**) sur la -[page des téléchargements](https://gitlab.com/ultreia.io/ird-t3/blob/develop/CHANGELOG.md). +[page des téléchargements](https://gitlab.com/ultreiaio/ird-t3/blob/develop/CHANGELOG.md). ## Lancement ===================================== src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png ===================================== Binary files a/src/site/resources/images/logos/argouml-logo.png and b/src/site/resources/img/argouml-logo.png differ ===================================== src/site/resources/images/logos/logo-OT_web.png → src/site/resources/img/logo-OT_web.png ===================================== Binary files a/src/site/resources/images/logos/logo-OT_web.png and b/src/site/resources/img/logo-OT_web.png differ ===================================== src/site/resources/img/logo_IntelliJIDEA.png ===================================== Binary files /dev/null and b/src/site/resources/img/logo_IntelliJIDEA.png differ ===================================== src/site/resources/images/logos/logo_ird.png → src/site/resources/img/logo_ird.png ===================================== Binary files a/src/site/resources/images/logos/logo_ird.png and b/src/site/resources/img/logo_ird.png differ ===================================== src/site/resources/img/maven-feather.png ===================================== Binary files /dev/null and b/src/site/resources/img/maven-feather.png differ ===================================== src/site/resources/img/struts2-logo.png ===================================== Binary files /dev/null and b/src/site/resources/img/struts2-logo.png differ ===================================== src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png ===================================== Binary files a/src/site/resources/images/logos/topia-logo.png and b/src/site/resources/img/topia-logo.png differ ===================================== src/site/resources/site.js deleted ===================================== --- a/src/site/resources/site.js +++ /dev/null @@ -1,284 +0,0 @@ -/*- - * #%L - * ObServe - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -$(document).ready(function () { - - var metas = $('#mavenProjectProperties'); - - if (metas.length == 0) { - return; - } - - $.debugOn = function () { - $('#mavenProjectProperties').attr('DEBUG', true); - }; - - $.debugOff = function () { - $('#mavenProjectProperties').attr('DEBUG', null); - }; - - var debug = function (metas) { - return metas.attr('DEBUG'); - }; - - var urlParameters = decodeURIComponent(window.location.search.slice(1)) - .split('&') - .reduce(function _reduce(a, b) { - b = b.split('='); - a[b[0]] = b[1]; - return a; - }, {}); - - if (urlParameters.debug) { - $.debugOn(); - } - - var projectId = metas.attr('projectId'); - var version = metas.attr('version'); - var locale = metas.attr('locale'); - - var rootUrl= 'http://' + window.location.hostname ; - var useDocUrl = false; - var localeInPath = window.location.pathname.indexOf('/' + locale + '/') > -1; - - var DEBUG = debug(metas); - - if (DEBUG) { - console.info("localeInPath: " + localeInPath); - } - - var addVersion = function (metas) { - - var DEBUG = debug(metas); - - var versionsUrl = rootUrl + '/versions'; - - $.get(versionsUrl) - .fail(function () { - console.error("can't load url: " + versionsUrl); - }) - .done(function (allVersions) { - - if (DEBUG) { - console.info("Versions url: " + versionsUrl); - console.info("All versions: " + allVersions); - } - - var labels; - if ('en' == locale) { - labels = {develop: 'in progress', latest: 'latest release'}; - } else { - labels = {develop: 'en cours', latest: 'dernière stable'}; - } - var versions = allVersions.split(' '); - if (DEBUG) { - console.info("Versions : " + versions); - console.info("version : " + version); - } - var versionsHtml = "<select id='versions' class='versions pull-left'>"; - $(versions).each(function (index, value) { - value = value.trim(); - var label; - if ('develop' == value || 'latest' == value) { - label = labels[value]; - } else { - label = value; - } - - if (DEBUG) { - console.info("Version to add " + label + " (" + value + ")"); - } - versionsHtml += "<option value='" + value + "'"; - if (version == value) { - versionsHtml += " selected='selected'"; - } - versionsHtml += ">Version " + label + "</option>"; - }); - versionsHtml += "</select><span class='divider'>»</span>"; - - $('#breadcrumbs').find('> ul > li:nth-child(2)').html(versionsHtml); - $('#versions').change(function () { - var DEBUG = debug(metas); - var newVersion = $(this).val(); - var newUrl = rootUrl + '/' + newVersion; - if (localeInPath) { - newUrl += "/" + locale; - } - if (DEBUG) { - console.info("Change to version: " + newUrl); - } - window.location = newUrl; - }); - - }); - - }; - - var addScmwebeditor = function (metas) { - - var editorUrl = 'https://scmwebeditor.nuiton.org/scmwebeditor/edit.action'; - - if ('develop' != version) { - return; - } - - var skipDefaultFiles = [ - "project-info.html", - "team-list.html", - "mail-lists.html", - "integration.html", - "issue-tracking.html", - "license.html", - "source-repository.html", - "dependencies.html", - "dependency-info.html", - "dependency-convergence.html", - "plugin-management.html", - "plugins.html", - "dependency-management.html", - "project-summary.html", - "project-reports.html", - "dev-activity.html", - "file-activity.html", - "changelog.html", - "surefire-report.html", - "third-party-report.html", - "sonar.html", - "dependency-updates-report.html", - "plugin-updates-report.html", - "property-updates-report.html", - "changes-report.html", - "redmine-report.html", - "application-config-report.html" - ]; - - var DEBUG = debug(metas); - - var scm = 'https://gitlab.com/ultreia.io/observe.git'; - - if (DEBUG) { - console.info('scm: ' + scm); - } - - var sourcesType = metas.attr('sourcesType'); - - var pathname = document.location.pathname; - - // remove prefix - if (useDocUrl) { - pathname = pathname.replace('/' + projectId + '/develop', ''); - } else { - pathname = pathname.replace('/develop', ''); - } - - if (DEBUG) { - console.info('pathname: ' + pathname); - } - - var path; - if (pathname.indexOf('target/site') > 0) { - path = pathname.substr(pathname.indexOf('/site')). replace('/site/', ''); - } else { - if (pathname == '/' || pathname == '') { - // on / page - path = 'index.html'; - } else { - path = pathname; - } - } - - if (localeInPath) { - - // locale detected in path (means not default locale) - // remove locale from path - path = path.substr(('/' + locale).length); - } - - if (DEBUG) { - console.info('path: ' + path); - } - if ($.inArray(path, skipDefaultFiles) > -1) { - // skip this file - if (DEBUG) { - console.info('skipDefaultFiles: ' + path); - } - return; - } - - var skipFiles = metas.attr('scmwebeditor_skipFiles'); - if (skipFiles && skipFiles.indexOf(',' + path + ',') > -1) { - // skip this file - if (DEBUG) { - console.info('skipFiles: ' + path); - } - return; - } - - path = path.replace('.html', ''); - if (path.indexOf('/') == 0) { - path = path.substr(1); - } - - var vmFiles = metas.attr('scmwebeditor_vmFiles'); - - // add vm on vmFiles - if (vmFiles && vmFiles.indexOf(',' + path + ',') > -1) { - if (DEBUG) { - console.info("Found vm file: " + path); - } - path += '.' + sourcesType + '.vm'; - } else { - if (DEBUG) { - console.info("Not found vm file: " + path); - } - path += '.' + sourcesType; - } - - if (DEBUG) { - console.info('final path: ' + path); - } - - var address = scm + "/src/site"; - if (localeInPath) { - address += '/' + locale; - } - address += '/' + sourcesType + '/' + path; - if (DEBUG) { - console.info('address: ' + address); - } - var url = editorUrl + "?scmType=Git&selectedBranch=develop&repositoryRoot=" + scm + "&address=" + address; - - if (DEBUG) { - console.info('edit url: ' + url); - } - - $('#publishDate').prepend( - "<li class='pull-right'><a target='edit' href='" + url + - "'>Éditer la page</a></li>" + - "<li class='divider pull-right'>|</li>" - ); - - }; - - addScmwebeditor(metas); - - addVersion(metas); - -}); ===================================== src/site/site.xml ===================================== --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,14 +22,14 @@ <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> @@ -48,40 +48,28 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/${siteDeployClassifier}/images/logos/logo-OT_web.png</src> + <src>./img/logo-OT_web.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/> - - <logo href="http://struts.apache.org/" name="Struts 2" - img="${project.url}/${siteDeployClassifier}/images/logos/struts2-logo.png"/> - - <logo href="http://topia.nuiton.org" name="ToPIA" - img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/> - - <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/> + <logo href="http://maven.apache.org/" name="Maven" img="./img/maven-feather.png"/> + <logo href="http://struts.apache.org/" name="Struts 2" img="./img/struts2-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" img="./img/topia-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" 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-t3"/> + <item name="GitLab" href="https:/gitlab.com/ultreiaio/ird-t3"/> <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}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -103,12 +91,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='md' - scmwebeditor_vmFiles=",install,installer,"/> - </footer> </body> </project> ===================================== t3-installer/src/main/assembly/bin.xml ===================================== --- a/t3-installer/src/main/assembly/bin.xml +++ b/t3-installer/src/main/assembly/bin.xml @@ -21,22 +21,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<assembly> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>bin</id> <formats> <format>zip</format> </formats> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <scope>runtime</scope> - </dependencySet> - </dependencySets> <fileSets> <fileSet> - <directory>target</directory> + <directory>${project.build.directory}/lib</directory> + <outputDirectory>lib</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + + <fileSet> + <directory>${project.build.directory}</directory> <outputDirectory/> <fileMode>0755</fileMode> <includes> @@ -45,7 +49,7 @@ </fileSet> <fileSet> - <directory>target/classes</directory> + <directory>${project.build.outputDirectory}</directory> <outputDirectory/> <includes> <include>THIRD-PARTY.txt</include> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/a67b4c27c4bc7c4a62d4e5e9deef90b5...