Merge branch 'feature/ST5AS-26'

.gitignore

@@ -19,5 +19,3 @@ hs_err_pid*
 target
 .gradle
 build
-*.iml
-.idea

.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.4
+4.1.3

.travis.yml

@@ -1,17 +1,22 @@
 #
-# Generated by: https://openapi-generator.tech
+# Generated by OpenAPI Generator: https://openapi-generator.tech
+#
+# Ref: https://docs.travis-ci.com/user/languages/java/
 #
 language: java
 jdk:
-  - oraclejdk8
-  - oraclejdk7
+  - openjdk12
+  - openjdk11
+  - openjdk10
+  - openjdk9
+  - openjdk8
 before_install:
   # ensure gradlew has proper permission
   - chmod a+x ./gradlew
 script:
   # test using maven
-  - mvn test
-  # uncomment below to test using gradle
-  # - gradle test
-  # uncomment below to test using sbt 
+  #- mvn test
+  # test using gradle
+  - gradle test
+  # test using sbt 
   # - sbt test

README.md

@@ -1,4 +1,4 @@
-# sysml-api-client
+# sysml-v2-api-client
 
 SysML v2 API and Services
 - API version: 1.0.0
@@ -38,8 +38,8 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
   <groupId>org.omg.sysml</groupId>
-  <artifactId>sysml-api-client</artifactId>
-  <version>2019-05</version>
+  <artifactId>sysml-v2-api-client</artifactId>
+  <version>2019-09</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -49,7 +49,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "org.omg.sysml:sysml-api-client:2019-05"
+compile "org.omg.sysml:sysml-v2-api-client:2019-09"
 ```
 
 ### Others
@@ -62,7 +62,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/sysml-api-client-2019-05.jar`
+* `target/sysml-v2-api-client-2019-09.jar`
 * `target/lib/*.jar`
 
 ## Getting Started
@@ -71,28 +71,31 @@ Please follow the [installation](#installation) instruction and execute the foll
 
 ```java
 
-import org.omg.sysml.*;
-import org.omg.sysml.auth.*;
-import org.omg.sysml.model.*;
+// Import classes:
+import org.omg.sysml.ApiClient;
+import org.omg.sysml.ApiException;
+import org.omg.sysml.Configuration;
+import org.omg.sysml.models.*;
 import org.omg.sysml.api.ElementApi;
 
-import java.io.File;
-import java.util.*;
-
-public class ElementApiExample {
-
-    public static void main(String[] args) {
-        
-        ElementApi apiInstance = new ElementApi();
-        Map<String, Object> requestBody = null; // Map<String, Object> | 
-        try {
-            Element result = apiInstance.createElement(requestBody);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling ElementApi#createElement");
-            e.printStackTrace();
-        }
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath("http://localhost");
+
+    ElementApi apiInstance = new ElementApi(defaultClient);
+    Map<String, Object> body = null; // Map<String, Object> | 
+    try {
+      Element result = apiInstance.createElement(body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling ElementApi#createElement");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
     }
+  }
 }
 
 ```
@@ -124,6 +127,7 @@ Class | Method | HTTP request | Description
  - [Identified](docs/Identified.md)
  - [Project](docs/Project.md)
  - [Relationship](docs/Relationship.md)
+ - [RelationshipAllOf](docs/RelationshipAllOf.md)
 
 
 ## Documentation for Authorization

build.gradle

@@ -1,11 +1,13 @@
 apply plugin: 'idea'
 apply plugin: 'eclipse'
+apply plugin: 'java'
 
 group = 'org.omg.sysml'
-version = '2019-05'
+version = '2019-09'
 
 buildscript {
     repositories {
+        mavenCentral()
         jcenter()
     }
     dependencies {
@@ -17,7 +19,9 @@ buildscript {
 repositories {
     jcenter()
 }
-
+sourceSets {
+    main.java.srcDirs = ['src/main/java']
+}
 
 if(hasProperty('target') && target == 'android') {
 
@@ -83,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
 
     install {
         repositories.mavenInstaller {
-            pom.artifactId = 'sysml-api-client'
+            pom.artifactId = 'sysml-v2-api-client'
         }
     }
 
@@ -94,12 +98,17 @@ if(hasProperty('target') && target == 'android') {
 }
 
 dependencies {
-    compile 'io.swagger:swagger-annotations:1.5.17'
-    compile 'com.squareup.okhttp:okhttp:2.7.5'
-    compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
-    compile 'com.google.code.gson:gson:2.8.1'
-    compile 'io.gsonfire:gson-fire:1.8.0'
-    compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
+    compile 'io.swagger:swagger-annotations:1.5.22'
+    compile "com.google.code.findbugs:jsr305:3.0.2"
+    compile 'com.squareup.okhttp3:okhttp:3.14.2'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
+    compile 'com.google.code.gson:gson:2.8.5'
+    compile 'io.gsonfire:gson-fire:1.8.3'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
     compile 'org.threeten:threetenbp:1.3.5'
     testCompile 'junit:junit:4.12'
 }
+
+javadoc {
+    options.tags = [ "http.response.details:a:Http Response Details" ]
+}

build.sbt

@@ -1,20 +1,22 @@
 lazy val root = (project in file(".")).
   settings(
     organization := "org.omg.sysml",
-    name := "sysml-api-client",
-    version := "2019-05",
+    name := "sysml-v2-api-client",
+    version := "2019-09",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.17",
-      "com.squareup.okhttp" % "okhttp" % "2.7.5",
-      "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
-      "com.google.code.gson" % "gson" % "2.8.1",
+      "io.swagger" % "swagger-annotations" % "1.5.22",
+      "com.squareup.okhttp3" % "okhttp" % "3.14.2",
+      "com.squareup.okhttp3" % "logging-interceptor" % "3.14.2",
+      "com.google.code.gson" % "gson" % "2.8.5",
+      "org.apache.commons" % "commons-lang3" % "3.9",
       "org.threeten" % "threetenbp" % "1.3.5" % "compile",
-      "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
+      "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
+      "javax.annotation" % "jsr250-api" % "1.0" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

docs/Element.md

@@ -1,7 +1,9 @@
 
+
 # Element
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **atType** | **String** |  |  [optional]