Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GLIS Client
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
GLIS Client
Commits
800e6382
Commit
800e6382
authored
Jul 23, 2017
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgraded swagger-codegen to 2.3.0-SNAPSHOT
parent
2459f259
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
36 deletions
+21
-36
jersey2/pom.xml
jersey2/pom.xml
+7
-7
jersey2/src/test/java/org/genesys/glis/v1/api/RegistrationApiTest.java
...est/java/org/genesys/glis/v1/api/RegistrationApiTest.java
+1
-1
okhttp-gson/pom.xml
okhttp-gson/pom.xml
+4
-11
parent/pom.xml
parent/pom.xml
+2
-0
pom.xml
pom.xml
+2
-2
resteasy/pom.xml
resteasy/pom.xml
+5
-15
No files found.
jersey2/pom.xml
View file @
800e6382
...
...
@@ -16,8 +16,8 @@
<swagger-codegen.library>
jersey2
</swagger-codegen.library>
<org.slf4j.version>
1.7.25
</org.slf4j.version>
<jersey-version>
2.2
2.2
</jersey-version>
<jackson-version>
2.
7.5
</jackson-version>
<jersey-version>
2.2
5.1
</jersey-version>
<jackson-version>
2.
6.4
</jackson-version>
</properties>
<dependencies>
...
...
@@ -62,13 +62,13 @@
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.datatype
</groupId>
<artifactId>
jackson-datatype-j
oda
</artifactId>
<artifactId>
jackson-datatype-j
sr310
</artifactId>
<version>
${jackson-version}
</version>
</dependency>
<dependency>
<groupId>
joda-time
</groupId>
<artifactId>
j
oda-time
</artifactId>
<version>
${j
odatime
-version}
</version>
<groupId>
com.github.joschi.jackson
</groupId>
<artifactId>
j
ackson-datatype-threetenbp
</artifactId>
<version>
${j
ackson
-version}
</version>
</dependency>
<!-- XML processing: Jackson -->
...
...
@@ -102,7 +102,7 @@
<artifactId>
jersey-media-jaxb
</artifactId>
<version>
${jersey-version}
</version>
</dependency>
<!-- test logging -->
<dependency>
<groupId>
org.slf4j
</groupId>
...
...
jersey2/src/test/java/org/genesys/glis/v1/api/RegistrationApiTest.java
View file @
800e6382
...
...
@@ -108,7 +108,7 @@ public class RegistrationApiTest extends BaseApiTest {
@Test
public
void
testCollectionCollector
()
throws
ApiException
{
Registration
pgrfa
=
makePGRFA
(
"Matija"
,
"Matija "
).
method
(
"acqu"
)
.
collection
(
new
Collection
().
date
(
"2017-07-23"
).
elevation
(
100
).
missid
(
"Genesys GLIS"
).
addCollectorsItem
(
new
Collector
().
name
(
"Matija Obreza"
)));
.
collection
(
new
Collection
().
date
(
"2017-07-23"
).
elevation
(
100
).
missid
(
"Genesys GLIS"
).
addCollectorsItem
(
new
Collector
().
name
(
"Matija Obreza"
)
.
country
(
"SVN"
)
));
RegistrationResponse
response
=
api
.
registerPGRFA
(
pgrfa
);
assertThat
(
response
.
getDoi
(),
not
(
nullValue
()));
}
...
...
okhttp-gson/pom.xml
View file @
800e6382
<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"
>
<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"
>
<parent>
<groupId>
org.genesys-pgr
</groupId>
<artifactId>
glis-client-parent
</artifactId>
...
...
@@ -17,9 +18,8 @@
<swagger-codegen.library>
okhttp-gson
</swagger-codegen.library>
<okhttp-version>
2.7.5
</okhttp-version>
<gson-version>
2.
6.2
</gson-version>
<gson-version>
2.
8.1
</gson-version>
</properties>
<dependencies>
<dependency>
<groupId>
io.swagger
</groupId>
...
...
@@ -41,11 +41,6 @@
<artifactId>
gson
</artifactId>
<version>
${gson-version}
</version>
</dependency>
<dependency>
<groupId>
joda-time
</groupId>
<artifactId>
joda-time
</artifactId>
<version>
${jodatime-version}
</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>
junit
</groupId>
...
...
@@ -62,8 +57,6 @@
</dependencies>
<build>
<plugins>
</plugins>
<plugins></plugins>
</build>
</project>
parent/pom.xml
View file @
800e6382
...
...
@@ -32,6 +32,8 @@
<output>
${generated-sources-path}
</output>
<configOptions>
<withXml>
true
</withXml>
<java8>
true
</java8>
<dateLibrary>
java8
</dateLibrary>
<sourceFolder>
${generated-sources-java-path}
</sourceFolder>
<groupId>
org.genesys
</groupId>
<artifactId>
glis-client-${swagger-codegen.library}
</artifactId>
...
...
pom.xml
View file @
800e6382
...
...
@@ -60,8 +60,8 @@
<junit-version>
4.12
</junit-version>
<jodatime-version>
2.9.3
</jodatime-version>
<swagger-core.version>
1.5.1
2
</swagger-core.version>
<swagger-codegen.version>
2.
2.3
-SNAPSHOT
</swagger-codegen.version>
<swagger-core.version>
1.5.1
5
</swagger-core.version>
<swagger-codegen.version>
2.
3.0
-SNAPSHOT
</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>
...
...
resteasy/pom.xml
View file @
800e6382
<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"
>
<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"
>
<parent>
<groupId>
org.genesys-pgr
</groupId>
<artifactId>
glis-client-parent
</artifactId>
...
...
@@ -16,7 +17,7 @@
<swagger-codegen.library>
resteasy
</swagger-codegen.library>
<resteasy-version>
3.1.3.Final
</resteasy-version>
<jackson-version>
2.8.9
</jackson-version>
<jackson-version>
2.8.9
</jackson-version>
</properties>
<dependencies>
...
...
@@ -26,6 +27,7 @@
<version>
${swagger-core.version}
</version>
</dependency>
<!-- HTTP client: jersey-client -->
<!-- HTTP client: jersey-client -->
<dependency>
<groupId>
org.jboss.resteasy
</groupId>
...
...
@@ -63,21 +65,9 @@
<dependency>
<groupId>
com.fasterxml.jackson.datatype
</groupId>
<artifactId>
jackson-datatype-j
oda
</artifactId>
<artifactId>
jackson-datatype-j
sr310
</artifactId>
<version>
${jackson-version}
</version>
</dependency>
<dependency>
<groupId>
joda-time
</groupId>
<artifactId>
joda-time
</artifactId>
<version>
${jodatime-version}
</version>
</dependency>
<!-- Base64 encoding that works in both JVM and Android -->
<dependency>
<groupId>
com.brsanthu
</groupId>
<artifactId>
migbase64
</artifactId>
<version>
2.2
</version>
</dependency>
<dependency>
<groupId>
org.jboss.resteasy
</groupId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment