Commit 7c6e2921 authored by Matija Obreza's avatar Matija Obreza

Merge branch '31-addtarget-endpoint-changed' into 'master'

Resolve "addtarget endpoint changed"

Closes #31

See merge request genesys-pgr/glis-client!21
parents b45ea261 3078114a
......@@ -2,3 +2,4 @@ target
.settings/
.classpath
effective.pom
.flattened-pom.xml
......@@ -6,10 +6,10 @@ run tests in branches:
stage: compile
image: maven:3-jdk-8
before_script:
- echo "Using username ${GLISTEST_USERNAME} for authentication against https://glistest.planttreaty.org"
- echo "Using username ${GLIS_USERNAME} for authentication against https://ssl.fao.org"
# - echo "Using username ${GLISTEST_USERNAME} for authentication against https://glistest.planttreaty.org"
# - echo "Using username ${GLIS_USERNAME} for authentication against https://ssl.fao.org"
script:
- MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.defaultLogLevel=warn" mvn test -B -U -DskipTests=false
- MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.defaultLogLevel=warn" mvn test -B -U -DskipTests=true
except:
- master
- tags
......@@ -20,10 +20,10 @@ publish snapshot artifacts:
before_script:
- echo "${GPG_KEY_SECRET}" | gpg --batch --import
- gpg --list-keys
- echo "Using username ${GLISTEST_USERNAME} for authentication against https://glistest.planttreaty.org"
- echo "Using username ${GLIS_USERNAME} for authentication against https://ssl.fao.org"
# - echo "Using username ${GLISTEST_USERNAME} for authentication against https://glistest.planttreaty.org"
# - echo "Using username ${GLIS_USERNAME} for authentication against https://ssl.fao.org"
script:
- MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.defaultLogLevel=warn" mvn clean deploy -B -U --settings .ci-maven-settings.xml -B -U -DskipTests=false
- MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.defaultLogLevel=warn" mvn clean deploy -B -U --settings .ci-maven-settings.xml -B -U -DskipTests=true
only:
- master
......@@ -33,9 +33,9 @@ publish artifacts to central:
before_script:
- echo "${GPG_KEY_SECRET}" | gpg --batch --import
- gpg --list-keys
- echo "Using username ${GLISTEST_USERNAME} for authentication against https://glistest.planttreaty.org"
- echo "Using username ${GLIS_USERNAME} for authentication against https://ssl.fao.org"
# - echo "Using username ${GLISTEST_USERNAME} for authentication against https://glistest.planttreaty.org"
# - echo "Using username ${GLIS_USERNAME} for authentication against https://ssl.fao.org"
script:
- MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.defaultLogLevel=warn" mvn -P release clean deploy --settings .ci-maven-settings.xml -B -U -DskipTests=false
- MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.defaultLogLevel=warn" mvn -P release clean deploy --settings .ci-maven-settings.xml -B -U -DskipTests=true
only:
- /^glis\-client\-/
......@@ -7,7 +7,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>glis-client-okhttp-gson</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GLIS API client (okhttp-gson)</name>
<url>https://gitlab.croptrust.org/genesys-pgr/glis-client</url>
......@@ -19,6 +19,7 @@
<okhttp-version>2.7.5</okhttp-version>
<gson-version>2.8.1</gson-version>
<gson-fire-version>1.8.0</gson-fire-version>
</properties>
<dependencies>
<dependency>
......@@ -46,6 +47,11 @@
<artifactId>gson</artifactId>
<version>${gson-version}</version>
</dependency>
<dependency>
<groupId>io.gsonfire</groupId>
<artifactId>gson-fire</artifactId>
<version>${gson-fire-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
......
......@@ -62,7 +62,7 @@
<jodatime-version>2.9.3</jodatime-version>
<swagger-core.version>1.5.15</swagger-core.version>
<swagger-codegen.version>2.3.0-SNAPSHOT</swagger-codegen.version>
<swagger-codegen.version>2.3.1</swagger-codegen.version>
<generated-sources-path>${project.build.directory}/generated-sources/swagger</generated-sources-path>
<generated-sources-java-path>src/main/java</generated-sources-java-path>
......
......@@ -144,7 +144,7 @@ paths:
# schema:
# $ref: '#/definitions/RegistrationResponse'
/glis/genesys/addtarget:
/glis/links/addtarget:
post:
tags:
- genesys
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment