Merge pull request syndesisio#4822 from zregvart/pr/syndesis-1.7

Syndesis version 1.7
zregvart · Mar 11, 2019 · 393d32e · 393d32e
2 parents 4a0fabb + 07bc6ea
commit 393d32e
Show file tree

Hide file tree

Showing 90 changed files with 113 additions and 183 deletions.
diff --git a/app/common/model/pom.xml b/app/common/model/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.common</groupId>
     <artifactId>common-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/common/pom.xml b/app/common/pom.xml
@@ -21,13 +21,13 @@
   <parent>
     <groupId>io.syndesis</groupId>
     <artifactId>syndesis-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>io.syndesis.common</groupId>
   <artifactId>common-parent</artifactId>
-  <version>1.6-SNAPSHOT</version>
+  <version>1.7-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Common</name>

diff --git a/app/common/util/pom.xml b/app/common/util/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>io.syndesis.common</groupId>
     <artifactId>common-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/activemq/pom.xml b/app/connector/activemq/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/amqp/pom.xml b/app/connector/amqp/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/api-provider/pom.xml b/app/connector/api-provider/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/aws-s3/pom.xml b/app/connector/aws-s3/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/concur/pom.xml b/app/connector/concur/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/dropbox/pom.xml b/app/connector/dropbox/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/fhir/pom.xml b/app/connector/fhir/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -29,7 +29,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <hapi-fhir-version>3.4.0</hapi-fhir-version>
+    <hapi-fhir-version>3.5.0</hapi-fhir-version>
   </properties>
 
   <dependencies>
@@ -132,6 +132,21 @@
       <artifactId>spotbugs-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>ca.uhn.hapi.fhir</groupId>
+      <artifactId>hapi-fhir-base</artifactId>
+      <version>${hapi-fhir-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ca.uhn.hapi.fhir</groupId>
+      <artifactId>hapi-fhir-structures-dstu3</artifactId>
+      <version>${hapi-fhir-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ca.uhn.hapi.fhir</groupId>
+      <artifactId>hapi-fhir-client</artifactId>
+      <version>${hapi-fhir-version}</version>
+    </dependency>
 
     <!-- test -->
     <dependency>
@@ -218,18 +233,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <configuration>
-              <ignoredDependencies>
-                <ignoredDependency>ca.uhn.hapi.fhir:*:jar:*</ignoredDependency>
-              </ignoredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/app/connector/ftp/pom.xml b/app/connector/ftp/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/gmail/pom.xml b/app/connector/gmail/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/google-calendar/pom.xml b/app/connector/google-calendar/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/google-sheets/pom.xml b/app/connector/google-sheets/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/http/pom.xml b/app/connector/http/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/irc/pom.xml b/app/connector/irc/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/kafka/pom.xml b/app/connector/kafka/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/kudu/pom.xml b/app/connector/kudu/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>io.syndesis.connector</groupId>
         <artifactId>connector-parent</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...connector/kudu/src/main/resources/META-INF/services/org/apache/camel/component.properties b/...connector/kudu/src/main/resources/META-INF/services/org/apache/camel/component.properties
@@ -1,6 +1,6 @@
 #Generated by camel-package-maven-plugin
 #Thu Dec 27 13:37:10 CET 2018
-version=1.6-SNAPSHOT
+version=@project.version@
 projectName=Camel Apache Kudu Component
 groupId=camelinaction.component
 components=kudu

diff --git a/app/connector/kudu/src/main/resources/org/apache/camel/catalog/components/kudu.json b/app/connector/kudu/src/main/resources/org/apache/camel/catalog/components/kudu.json
@@ -16,7 +16,7 @@
     "firstVersion": "2.23.0",
     "groupId": "camelinaction.component",
     "artifactId": "connector-kudu",
-    "version": "1.6-SNAPSHOT"
+    "version": "@project.version@"
   },
   "componentProperties": {
     "resolvePropertyPlaceholders": { "kind": "property", "displayName": "Resolve Property Placeholders", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders." }
@@ -29,4 +29,4 @@
     "tableName": { "kind": "parameter", "displayName": "Table Name", "group": "producer", "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the table where the rows are stored" },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
   }
-}
+}
diff --git a/app/connector/log/pom.xml b/app/connector/log/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/mqtt/pom.xml b/app/connector/mqtt/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/odata/pom.xml b/app/connector/odata/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -370,18 +370,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <configuration>
-              <ignoredDependencies>
-                <ignoredDependency>org.apache.camel:camel-olingo4*:jar:*</ignoredDependency>
-              </ignoredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/app/connector/pom.xml b/app/connector/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>io.syndesis</groupId>
     <artifactId>syndesis-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>io.syndesis.connector</groupId>
   <artifactId>connector-parent</artifactId>
-  <version>1.6-SNAPSHOT</version>
+  <version>1.7-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Connector</name>

diff --git a/app/connector/rest-swagger/pom.xml b/app/connector/rest-swagger/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/salesforce/pom.xml b/app/connector/salesforce/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/app/connector/servicenow/pom.xml b/app/connector/servicenow/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/sftp/pom.xml b/app/connector/sftp/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/slack/pom.xml b/app/connector/slack/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/sql/pom.xml b/app/connector/sql/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/app/connector/support/catalog/pom.xml b/app/connector/support/catalog/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/support/maven-plugin/pom.xml b/app/connector/support/maven-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/app/connector/support/processor/pom.xml b/app/connector/support/processor/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/app/connector/support/test/pom.xml b/app/connector/support/test/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.syndesis.connector</groupId>
     <artifactId>connector-parent</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>