Merge pull request #3 from dsimansk/tp4-update

syndesisio · Apr 4, 2018 · 786e79b · 786e79b
2 parents d75cc41 + b18b833
commit 786e79b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 51 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,35 +23,14 @@
     <!-- dependencies -->
     <spring-boot.version>1.5.8.RELEASE</spring-boot.version>
     <camel.version>2.20.1</camel.version>
-    <syndesis.version>1.2.8</syndesis.version>
+    <syndesis.version>1.3.4</syndesis.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-spring-boot-dependencies</artifactId>
-        <version>${camel.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>io.syndesis</groupId>
-        <artifactId>syndesis-rest-parent</artifactId>
-        <version>${syndesis.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>io.syndesis</groupId>
-        <artifactId>integration-runtime</artifactId>
+        <groupId>io.syndesis.extension</groupId>
+        <artifactId>extension-bom</artifactId>
         <version>${syndesis.version}</version>
         <type>pom</type>
         <scope>import</scope>
@@ -61,20 +40,6 @@
 
 
   <dependencies>
-    <!-- annotation processing -->
-    <dependency>
-      <groupId>io.syndesis</groupId>
-      <artifactId>syndesis-annotation-processor</artifactId>
-      <version>${syndesis.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- runtime -->
-    <dependency>
-      <groupId>io.syndesis.integration-runtime</groupId>
-      <artifactId>runtime-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
@@ -127,22 +92,16 @@
       </plugin>
 
       <plugin>
-        <groupId>io.syndesis</groupId>
-        <artifactId>syndesis-maven-plugin</artifactId>
+        <groupId>io.syndesis.extension</groupId>
+        <artifactId>extension-maven-plugin</artifactId>
         <version>${syndesis.version}</version>
         <configuration>
           <listAllArtifacts>false</listAllArtifacts>
         </configuration>
         <executions>
           <execution>
-            <id>generate</id>
             <goals>
               <goal>generate-metadata</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>repackage</id>
-            <goals>
               <goal>repackage-extension</goal>
             </goals>
           </execution>

diff --git a/src/main/resources/camel/extension.xml → ...ETA-INF/syndesis/extensions/extension.xml b/src/main/resources/camel/extension.xml → ...ETA-INF/syndesis/extensions/extension.xml
diff --git a/src/main/resources/META-INF/syndesis/syndesis-extension-definition.json b/src/main/resources/META-INF/syndesis/syndesis-extension-definition.json
@@ -1,22 +1,21 @@
 {
   "tags" : [ "experimental", "feature" ],
   "actions" : [ {
-    "actionType": "extension",
+    "actionType": "step",
     "id": "damage-report",
     "name": "Damage Reporter",
     "description": "Generates contact list for damaged items",
     "descriptor": {
       "kind": "ENDPOINT",
       "entrypoint": "direct:damage-report",
+      "resource": "classpath:META-INF/syndesis/extensions/extension.xml",
       "inputDataShape": {
         "kind": "java",
-        "type": "java.lang.String",
-        "specification": "{\"JavaClass\":{\"jsonType\":\"io.atlasmap.java.v2.JavaClass\",\"className\":\"java.lang.String\",\"primitive\":false,\"synthetic\":false,\"javaEnumFields\":{\"javaEnumField\":[]},\"javaFields\":{\"javaField\":[]},\"packageName\":\"java.lang\",\"annotation\":false,\"annonymous\":false,\"enumeration\":false,\"localClass\":false,\"memberClass\":false,\"uri\":\"atlas:java?className=java.lang.String\",\"interface\":false}}"
+        "type": "java.lang.String"
       },
       "outputDataShape": {
         "kind": "java",
-        "type": "io.syndesis.example.extension.tp3.TodoReport",
-        "specification": "{\"JavaClass\":{\"jsonType\":\"io.atlasmap.java.v2.JavaClass\",\"modifiers\":{\"modifier\":[\"PUBLIC\"]},\"className\":\"io.syndesis.example.extension.tp3.TodoReport\",\"primitive\":false,\"synthetic\":false,\"javaEnumFields\":{\"javaEnumField\":[]},\"javaFields\":{\"javaField\":[{\"jsonType\":\"io.atlasmap.java.v2.JavaField\",\"path\":\"task\",\"status\":\"SUPPORTED\",\"fieldType\":\"STRING\",\"modifiers\":{\"modifier\":[\"PRIVATE\"]},\"name\":\"task\",\"className\":\"java.lang.String\",\"getMethod\":\"getTask\",\"setMethod\":\"setTask\",\"primitive\":true,\"synthetic\":false}]},\"packageName\":\"io.syndesis.example.extension.tp3\",\"annotation\":false,\"annonymous\":false,\"enumeration\":false,\"localClass\":false,\"memberClass\":false,\"uri\":\"atlas:java?className=io.syndesis.example.extension.tp3.TodoReport\",\"interface\":false}}"
+        "type": "io.syndesis.example.extension.tp3.TodoReport"
       },
       "propertyDefinitionSteps": []
     }