Browse Source

adapter pom整理

mcy 6 years ago
parent
commit
11ac253c46

+ 1 - 1
client-adapter/common/pom.xml

@@ -14,7 +14,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.protocol</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>${canal_version}</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>

+ 2 - 2
client-adapter/elasticsearch/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
     <artifactId>client-adapter.elasticsearch</artifactId>
     <packaging>jar</packaging>
-    <name>canal client adapter ElasticSearch module for otter ${project.version}</name>
+    <name>canal client adapter elasticsearch module for otter ${project.version}</name>
 
     <dependencies>
         <dependency>

+ 24 - 2
client-adapter/launcher/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.client</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>${canal_version}</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -93,6 +93,19 @@
             <classifier>jar-with-dependencies</classifier>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.otter</groupId>
+            <artifactId>client-adapter.elasticsearch</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>*</artifactId>
+                    <groupId>*</groupId>
+                </exclusion>
+            </exclusions>
+            <classifier>jar-with-dependencies</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -104,13 +117,17 @@
                 <version>2.0.1.RELEASE</version>
                 <configuration>
                     <excludes>
+                        <exclude>
+                            <groupId>com.alibaba.otter</groupId>
+                            <artifactId>client-adapter.logger</artifactId>
+                        </exclude>
                         <exclude>
                             <groupId>com.alibaba.otter</groupId>
                             <artifactId>client-adapter.hbase</artifactId>
                         </exclude>
                         <exclude>
                             <groupId>com.alibaba.otter</groupId>
-                            <artifactId>client-adapter.logger</artifactId>
+                            <artifactId>client-adapter.elasticsearch</artifactId>
                         </exclude>
                     </excludes>
                 </configuration>
@@ -142,6 +159,11 @@
                                         <include name="*.yml" />
                                     </fileset>
                                 </copy>
+                                <copy todir="${project.basedir}/target/config/es" overwrite="true">
+                                    <fileset dir="${project.basedir}/../elasticsearch/src/main/resources/es" erroronmissingdir="true">
+                                        <include name="*.yml" />
+                                    </fileset>
+                                </copy>
                             </tasks>
                         </configuration>
                     </execution>

+ 2 - 1
client-adapter/pom.xml

@@ -14,7 +14,8 @@
         <java_source_version>1.8</java_source_version>
         <java_target_version>1.8</java_target_version>
         <file_encoding>UTF-8</file_encoding>
-        <canal_version>1.1.1-SNAPSHOT</canal_version>
+
+        <canal_version>1.1.2-SNAPSHOT</canal_version>
     </properties>
 
     <modules>