From 452ab8e74075f78c780177627dcf5e580bb5ba21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=8F=E7=83=88?= <caikang.ck@alibaba-inc.com>
Date: Thu, 1 Feb 2018 14:47:03 +0800
Subject: [PATCH] 1. kotlin 1.2.21 2. p3c-pmd 1.3.4 3. idea-plugin 1.0.4 4.
 eclipse-plugin 1.0.4

---
 .../com.alibaba.smartfox.eclipse.feature/feature.xml          | 2 +-
 eclipse-plugin/com.alibaba.smartfox.eclipse.feature/pom.xml   | 2 +-
 .../com.alibaba.smartfox.eclipse.plugin/META-INF/MANIFEST.MF  | 2 +-
 eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml    | 4 ++--
 .../com.alibaba.smartfox.eclipse.updatesite/pom.xml           | 2 +-
 eclipse-plugin/pom.xml                                        | 4 ++--
 idea-plugin/gradle.properties                                 | 4 ++--
 idea-plugin/p3c-common/build.gradle                           | 2 +-
 p3c-pmd/pom.xml                                               | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclipse-plugin/com.alibaba.smartfox.eclipse.feature/feature.xml b/eclipse-plugin/com.alibaba.smartfox.eclipse.feature/feature.xml
index ffbe62f..552fc5e 100644
--- a/eclipse-plugin/com.alibaba.smartfox.eclipse.feature/feature.xml
+++ b/eclipse-plugin/com.alibaba.smartfox.eclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
         id="com.alibaba.smartfox.eclipse.feature"
         label="%feature.label"
-        version="1.0.3.qualifier"
+        version="1.0.4.qualifier"
         provider-name="%feature.provider_name"
         plugin="com.alibaba.smartfox.eclipse.plugin"
         image="smartfox.png">
diff --git a/eclipse-plugin/com.alibaba.smartfox.eclipse.feature/pom.xml b/eclipse-plugin/com.alibaba.smartfox.eclipse.feature/pom.xml
index 30ba5b0..0203765 100644
--- a/eclipse-plugin/com.alibaba.smartfox.eclipse.feature/pom.xml
+++ b/eclipse-plugin/com.alibaba.smartfox.eclipse.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.alibaba.smartfox.eclipse</groupId>
     <artifactId>smartfox-eclipse</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>com.alibaba.smartfox.eclipse.feature</artifactId>
   <packaging>eclipse-feature</packaging>
diff --git a/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/META-INF/MANIFEST.MF b/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/META-INF/MANIFEST.MF
index 94d5f23..3a696bc 100644
--- a/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/META-INF/MANIFEST.MF
+++ b/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.alibaba.smartfox.eclipse.plugin
 Bundle-SymbolicName: com.alibaba.smartfox.eclipse.plugin;singleton:=true
-Bundle-Version: 1.0.3.qualifier
+Bundle-Version: 1.0.4.qualifier
 Bundle-Activator: com.alibaba.smartfox.eclipse.SmartfoxActivator
 Bundle-Vendor: Alibaba
 Require-Bundle: org.eclipse.ui,
diff --git a/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml b/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml
index 3b01a93..5b461cd 100644
--- a/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml
+++ b/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.alibaba.smartfox.eclipse</groupId>
     <artifactId>smartfox-eclipse</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>com.alibaba.smartfox.eclipse.plugin</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.alibaba.p3c</groupId>
       <artifactId>p3c-pmd</artifactId>
-      <version>1.3.3</version>
+      <version>1.3.4</version>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
diff --git a/eclipse-plugin/com.alibaba.smartfox.eclipse.updatesite/pom.xml b/eclipse-plugin/com.alibaba.smartfox.eclipse.updatesite/pom.xml
index f8f8d3b..aecaa4c 100644
--- a/eclipse-plugin/com.alibaba.smartfox.eclipse.updatesite/pom.xml
+++ b/eclipse-plugin/com.alibaba.smartfox.eclipse.updatesite/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.alibaba.smartfox.eclipse</groupId>
     <artifactId>smartfox-eclipse</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>com.alibaba.smartfox.eclipse.updatesite</artifactId>
   <packaging>eclipse-repository</packaging>
diff --git a/eclipse-plugin/pom.xml b/eclipse-plugin/pom.xml
index c5dcc65..868ee64 100644
--- a/eclipse-plugin/pom.xml
+++ b/eclipse-plugin/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.smartfox.eclipse</groupId>
     <artifactId>smartfox-eclipse</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <inceptionYear>2017</inceptionYear>
     <properties>
@@ -14,7 +14,7 @@
         <eclipse-repo.url>http://download.eclipse.org/releases/neon</eclipse-repo.url>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <ajdt-eclipse-repo.url>http://download.eclipse.org/tools/ajdt/46/dev/update</ajdt-eclipse-repo.url>
-        <kotlin.version>1.2.0</kotlin.version>
+        <kotlin.version>1.2.21</kotlin.version>
         <eclipse-release>juno</eclipse-release>
     </properties>
     <modules>
diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
index 7d4496d..89d9145 100644
--- a/idea-plugin/gradle.properties
+++ b/idea-plugin/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.2.0
+kotlin_version=1.2.21
 #idea_version=171.3780.15
 idea_version=14.1.7
 plugin_name=Alibaba Java Coding Guidelines
@@ -6,4 +6,4 @@ pmd_version=5.5.2
 gradle_jetbrains_version=0.2.13
 systemProp.file.encoding=UTF-8
 
-plugin_version=1.0.3
+plugin_version=1.0.4
diff --git a/idea-plugin/p3c-common/build.gradle b/idea-plugin/p3c-common/build.gradle
index 3c3620b..1b2f2d0 100644
--- a/idea-plugin/p3c-common/build.gradle
+++ b/idea-plugin/p3c-common/build.gradle
@@ -38,7 +38,7 @@ ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
 dependencies {
     compile group: 'org.freemarker', name: 'freemarker', version: '2.3.25-incubating'
-    compile 'com.alibaba.p3c:p3c-pmd:1.3.3'
+    compile 'com.alibaba.p3c:p3c-pmd:1.3.4'
     compile group: 'org.javassist', name: 'javassist', version: '3.21.0-GA'
 }
 
diff --git a/p3c-pmd/pom.xml b/p3c-pmd/pom.xml
index 9238167..9b3a50b 100644
--- a/p3c-pmd/pom.xml
+++ b/p3c-pmd/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>  
   <groupId>com.alibaba.p3c</groupId>
   <artifactId>p3c-pmd</artifactId>  
-  <version>1.3.3</version>
+  <version>1.3.4</version>
   <packaging>jar</packaging>  
   <name>p3c-pmd</name>  
   <properties>
-- 
GitLab