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

Commits:

12 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -77,10 +77,22 @@ stage:
    77 77 
         - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y
    78 78 
         - close-milestone.sh
    79 79 
         - create-stage.sh
    80 
    -    - close-stage.sh
    80 
    +    - drop-stage.sh
    81 81 
         - update-staging-changelog.sh
    82 82 
         - create-milestone.sh
    83 83
    84 
    +release:
    85 
    +  <<: *env_staging
    86 
    +  <<: *test_manual
    87 
    +  <<: *before_script_clone
    88 
    +  script:
    89 
    +    - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y
    90 
    +    - close-milestone.sh
    91 
    +    - create-stage.sh
    92 
    +    - close-and-release-stage.sh
    93 
    +    - update-changelog.sh
    94 
    +    - create-milestone.sh
    95 
    +
    84 96 
     deploy-snapshot:
    85 97 
       <<: *env_staging
    86 98 
       <<: *test_manual
    ... ... @@ -138,13 +150,13 @@ staging-site:
    138 150 
       <<: *staging
    139 151 
       <<: *deploy_site
    140 152
    141 
    -release:
    153 
    +stage-release:
    142 154 
       <<: *staging
    143 155 
       when: manual
    144 156 
       script:
    145 157 
         - release-stage.sh
    146 158
    147 
    -drop:
    159 
    +stage-drop:
    148 160 
       <<: *staging
    149 161 
       when: manual
    150 162 
       script:

  • CHANGELOG.md The diff for this file was not included because it is too large.
  • observe/pom.xml
    ... ... @@ -20,7 +20,8 @@
    20 20 
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 21 
       #L%
    22 22 
       -->
    23 
    -<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/xsd/maven-4.0.0.xsd">
    23 
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    24 
    +         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    24 25 
       <modelVersion>4.0.0</modelVersion>
    25 26
    26 27 
       <parent>
    ... ... @@ -104,6 +105,40 @@
    104 105 
             </executions>
    105 106 
           </plugin>
    106 107
    108 
    +      <plugin>
    109 
    +        <groupId>org.codehaus.mojo</groupId>
    110 
    +        <artifactId>wagon-maven-plugin</artifactId>
    111 
    +        <configuration>
    112 
    +          <serverId>doc.ultreia.io</serverId>
    113 
    +          <url>scpexe://ultreia.io/var/www/observe/release</url>
    114 
    +        </configuration>
    115 
    +        <executions>
    116 
    +          <execution>
    117 
    +            <phase>deploy</phase>
    118 
    +            <id>deploy-zip</id>
    119 
    +            <goals>
    120 
    +              <goal>upload-single</goal>
    121 
    +            </goals>
    122 
    +            <configuration>
    123 
    +              <fromFile>${project.build.directory}/client-${project.version}.zip</fromFile>
    124 
    +              <toFile>observe-${project.version}.zip</toFile>
    125 
    +            </configuration>
    126 
    +          </execution>
    127 
    +          <execution>
    128 
    +            <phase>deploy</phase>
    129 
    +            <id>deploy-war</id>
    130 
    +            <goals>
    131 
    +              <goal>upload-single</goal>
    132 
    +            </goals>
    133 
    +            <configuration>
    134 
    +              <fromFile>${project.build.directory}/server-${project.version}.war</fromFile>
    135 
    +              <toFile>observe-${project.version}.war</toFile>
    136 
    +            </configuration>
    137 
    +          </execution>
    138 
    +        </executions>
    139 
    +      </plugin>
    140 
    +
    141 
    +
    107 142 
         </plugins>
    108 143 
       </build>
    109 144 
     </project>

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>24</version>
    29 
    +    <version>25</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -164,7 +164,7 @@
    164 164 
         <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion>
    165 165 
         <nuitonConverterVersion>1.0</nuitonConverterVersion>
    166 166 
         <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
    167 
    -    <httpVersion>1.0.6</httpVersion>
    167 
    +    <httpVersion>1.0.7</httpVersion>
    168 168 
         <xworkVersion>2.3.33</xworkVersion>
    169 169 
         <flexmarkVersion>0.26.4</flexmarkVersion>
    170 170 
         <hibernateVersion>5.1.9.Final</hibernateVersion>
    ... ... @@ -176,6 +176,8 @@
    176 176 
         <geoToolsVersion>17.2</geoToolsVersion>
    177 177 
         <guavaVersion>23.0</guavaVersion>
    178 178
    179 
    +    <gitlabPluginVersion>1.0.12-SNAPSHOT</gitlabPluginVersion>
    180 
    +
    179 181 
         <!-- license header configuration -->
    180 182 
         <license.licenseName>gpl_v3</license.licenseName>
    181 183 
         <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>
    ... ... @@ -199,6 +201,7 @@
    199 201 
         <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle>
    200 202 
         <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers>
    201 203 
         <gitlab.fromMilestone>5.0</gitlab.fromMilestone>
    204 
    +    <gitlab.stagingUrl>https://observe.ultreia.io/release</gitlab.stagingUrl>
    202 205
    203 206 
         <!-- deploy nothing -->
    204 207 
         <maven.deploy.skip>true</maven.deploy.skip>
    ... ... @@ -857,31 +860,6 @@
    857 860 
           </plugin>
    858 861
    859 862 
           <plugin>
    860 
    -        <artifactId>maven-enforcer-plugin</artifactId>
    861 
    -        <executions>
    862 
    -          <execution>
    863 
    -            <id>enforce-maven</id>
    864 
    -            <goals>
    865 
    -              <goal>enforce</goal>
    866 
    -            </goals>
    867 
    -            <inherited>true</inherited>
    868 
    -            <phase>initialize</phase>
    869 
    -            <configuration>
    870 
    -              <rules>
    871 
    -                <requireMavenVersion>
    872 
    -                  <version>3.5.0</version>
    873 
    -                </requireMavenVersion>
    874 
    -              </rules>
    875 
    -              <ignoreCache>true</ignoreCache>
    876 
    -              <failFast>true</failFast>
    877 
    -              <fail>true</fail>
    878 
    -
    879 
    -            </configuration>
    880 
    -          </execution>
    881 
    -        </executions>
    882 
    -      </plugin>
    883 
    -
    884 
    -      <plugin>
    885 863 
             <groupId>org.codehaus.mojo</groupId>
    886 864 
             <artifactId>buildnumber-maven-plugin</artifactId>
    887 865 
             <executions>
    ... ... @@ -1009,18 +987,21 @@
    1009 987 
               <configuration>
    1010 988 
                 <releaseArtifacts>
    1011 989 
                   <releaseArtifact>
    990 
    +                <flatLayout>true</flatLayout>
    1012 991 
                     <groupId>fr.ird.observe</groupId>
    1013 992 
                     <artifactId>observe</artifactId>
    1014 993 
                     <name>Application</name>
    1015 994 
                     <type>zip</type>
    1016 995 
                   </releaseArtifact>
    1017 996 
                   <releaseArtifact>
    997 
    +                <flatLayout>true</flatLayout>
    1018 998 
                     <groupId>fr.ird.observe</groupId>
    1019 999 
                     <artifactId>observe</artifactId>
    1020 1000 
                     <name>Serveur</name>
    1021 1001 
                     <type>war</type>
    1022 1002 
                   </releaseArtifact>
    1023 1003 
                 </releaseArtifacts>
    1004 
    +
    1024 1005 
               </configuration>
    1025 1006 
             </plugin>
    1026 1007

  • server-configuration/pom.xml
    ... ... @@ -99,6 +99,20 @@
    99 99 
           <scope>compile</scope>
    100 100 
         </dependency>
    101 101
    102 
    +    <dependency>
    103 
    +      <groupId>org.slf4j</groupId>
    104 
    +      <artifactId>slf4j-jcl</artifactId>
    105 
    +      <scope>test</scope>
    106 
    +    </dependency>
    107 
    +
    108 
    +    <!-- test dependencies -->
    109 
    +
    110 
    +    <dependency>
    111 
    +      <groupId>junit</groupId>
    112 
    +      <artifactId>junit</artifactId>
    113 
    +    </dependency>
    114 
    +
    115 
    +
    102 116 
       </dependencies>
    103 117
    104 118 
       <build>

  • server/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java → server-configuration/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java
    ... ... @@ -92,7 +92,7 @@ public class ObserveWebDatabasesHelperTest {
    92 92 
         public void setUp() throws IOException {
    93 93
    94 94 
             java.nio.file.Files.createDirectories(new File(System.getProperty("java.io.tmpdir")).toPath());
    95 
    -        configuration = new ServerConfig("observeweb-test.conf");
    95 
    +        configuration = new ServerConfig("src/main/test/resources/observeweb-test.conf");
    96 96 
             configuration.setBaseDirectory(Files.createTempDir());
    97 97 
             configuration.init();
    98 98 
             observeWebDatabasesHelper = new ObserveWebDatabasesHelper();

  • server/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java → server-configuration/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java
    ... ... @@ -77,7 +77,7 @@ public class ObserveWebUsersHelperTest {
    77 77 
         public void setUp() throws Exception {
    78 78 
             java.nio.file.Files.createDirectories(new File(System.getProperty("java.io.tmpdir")).toPath());
    79 79
    80 
    -        configuration = new ServerConfig("observeweb-test.conf");
    80 
    +        configuration = new ServerConfig("src/main/test/resources/observeweb-test.conf");
    81 81 
             configuration.setBaseDirectory(Files.createTempDir());
    82 82 
             configuration.init();
    83 83 
             observeWebUsersHelper = new ObserveWebUsersHelper();

  • server/src/test/resources/observeweb-test.conf → server-configuration/src/test/resources/observeweb-test.conf

  • server/src/test/java/fr/ird/observe/server/controller/v1/ClassMappingRestApiTest.java deleted
    1 
    -package fr.ird.observe.server.controller.v1;
    2 
    -
    3 
    -/*-
    4 
    - * #%L
    5 
    - * ObServe :: Server
    6 
    - * %%
    7 
    - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    - * %%
    9 
    - * This program is free software: you can redistribute it and/or modify
    10 
    - * it under the terms of the GNU General Public License as
    11 
    - * published by the Free Software Foundation, either version 3 of the
    12 
    - * License, or (at your option) any later version.
    13 
    - *
    14 
    - * This program is distributed in the hope that it will be useful,
    15 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    - * GNU General Public License for more details.
    18 
    - *
    19 
    - * You should have received a copy of the GNU General Public
    20 
    - * License along with this program.  If not, see
    21 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    - * #L%
    23 
    - */
    24 
    -
    25 
    -import javax.annotation.Generated;
    26 
    -import org.junit.Test;
    27 
    -
    28 
    -@Generated(value = "io.ultreia.java4all.http.maven.plugin.GenerateHttpApiMojo", date = "Sun Jul 16 14:27:04 CEST 2017")
    29 
    -public class ClassMappingRestApiTest {
    30 
    -
    31 
    -    @Test
    32 
    -    public void test() {
    33 
    -        new ClassMappingRestApi();
    34 
    -    }
    35 
    -
    36 
    -}

  • services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java
    ... ... @@ -59,7 +59,7 @@ public class ObserveServiceFactoryClient extends ObserveServiceFactorySupport im
    59 59
    60 60 
             }
    61 61 
         });
    62 
    -    private final static ClassMappingClient CLASS_MAPPING = new ClassMappingClient();
    62 
    +    private final static ClassMappingClient CLASS_MAPPING = ClassMappingClient.get();
    63 63
    64 64 
         @Override
    65 65 
         public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) {

  • services-client/src/test/java/fr/ird/observe/services/client/ClassMappingClientTest.java deleted
    1 
    -package fr.ird.observe.services.client;
    2 
    -
    3 
    -/*-
    4 
    - * #%L
    5 
    - * ObServe :: Services client implementation
    6 
    - * %%
    7 
    - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    - * %%
    9 
    - * This program is free software: you can redistribute it and/or modify
    10 
    - * it under the terms of the GNU General Public License as
    11 
    - * published by the Free Software Foundation, either version 3 of the
    12 
    - * License, or (at your option) any later version.
    13 
    - *
    14 
    - * This program is distributed in the hope that it will be useful,
    15 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    - * GNU General Public License for more details.
    18 
    - *
    19 
    - * You should have received a copy of the GNU General Public
    20 
    - * License along with this program.  If not, see
    21 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    - * #L%
    23 
    - */
    24 
    -
    25 
    -import javax.annotation.Generated;
    26 
    -import org.junit.Test;
    27 
    -
    28 
    -@Generated(value = "io.ultreia.java4all.http.maven.plugin.GenerateHttpClientMojo", date = "Fri Sep 01 17:24:34 CEST 2017")
    29 
    -public class ClassMappingClientTest {
    30 
    -
    31 
    -    @Test
    32 
    -    public void test() {
    33 
    -        new ClassMappingClient();
    34 
    -    }
    35 
    -
    36 
    -}

  • services-local/src/main/java/fr/ird/observe/services/local/ObserveServiceFactoryLocal.java
    ... ... @@ -61,7 +61,7 @@ public class ObserveServiceFactoryLocal extends ObserveServiceFactorySupport {
    61 61 
         /** Logger. */
    62 62 
         private static final Log log = LogFactory.getLog(ObserveServiceFactoryLocal.class);
    63 63 
         private static final TimeLog TIME_LOG = new TimeLog(ObserveServiceFactoryLocal.class, 500, 1000);
    64 
    -    private static final ClassMappingLocal CLASS_MAPPING = new ClassMappingLocal();
    64 
    +    private static final ClassMappingLocal CLASS_MAPPING = ClassMappingLocal.get();
    65 65
    66 66 
         @Override
    67 67 
         public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.