From c868d5bb47de15be31da35d0842d8c2964de1528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=8F=E7=83=88?= <caikang.ck@alibaba-inc.com>
Date: Wed, 29 Nov 2017 09:57:57 +0800
Subject: [PATCH] p3c-pmd 1.3.2 idea-plugin 1.0.2 upgrade kotlin version to
 1.2.0

---
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   | 31 -------------------
 eclipse-plugin/pom.xml                        |  2 +-
 idea-plugin/gradle.properties                 |  2 +-
 idea-plugin/p3c-common/build.gradle           |  4 +--
 p3c-pmd/pom.xml                               |  2 +-
 6 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml b/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml
index dbf0ad7..3b0852a 100644
--- a/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml
+++ b/eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.alibaba.p3c</groupId>
       <artifactId>p3c-pmd</artifactId>
-      <version>1.3.1</version>
+      <version>1.3.2</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 17fa208..e322f1e 100644
--- a/eclipse-plugin/com.alibaba.smartfox.eclipse.updatesite/pom.xml
+++ b/eclipse-plugin/com.alibaba.smartfox.eclipse.updatesite/pom.xml
@@ -10,35 +10,4 @@
   <artifactId>com.alibaba.smartfox.eclipse.updatesite</artifactId>
   <packaging>eclipse-repository</packaging>
   <inceptionYear>2017</inceptionYear>
-  <profiles>
-    <profile>
-      <id>publish-to-update-site</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-p2-extras-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>publish</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>mirror</goal>
-                </goals>
-                <configuration>
-                  <source>
-                    <repository>
-                      <url>${project.build.directory}/repository</url>
-                    </repository>
-                  </source>
-                  <append>true</append>
-                  <destination>${eclipse.updatesite.path}</destination>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/eclipse-plugin/pom.xml b/eclipse-plugin/pom.xml
index 92551bf..d0bd2cc 100644
--- a/eclipse-plugin/pom.xml
+++ b/eclipse-plugin/pom.xml
@@ -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.1.51</kotlin.version>
+        <kotlin.version>1.2.0</kotlin.version>
         <eclipse-release>juno</eclipse-release>
     </properties>
     <modules>
diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
index c944d12..89f4e01 100644
--- a/idea-plugin/gradle.properties
+++ b/idea-plugin/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.1.51
+kotlin_version=1.2.0
 #idea_version=171.3780.15
 idea_version=14.1.7
 plugin_name=Alibaba Java Coding Guidelines
diff --git a/idea-plugin/p3c-common/build.gradle b/idea-plugin/p3c-common/build.gradle
index 9d21123..f667643 100644
--- a/idea-plugin/p3c-common/build.gradle
+++ b/idea-plugin/p3c-common/build.gradle
@@ -32,13 +32,13 @@ intellij {
     updateSinceUntilBuild false
     sandboxDirectory "$project.buildDir/idea-sandbox/$idea_version"
 }
-version '1.0.1'
+version '1.0.2'
 
 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.0'
+    compile 'com.alibaba.p3c:p3c-pmd:1.3.2'
     compile group: 'org.javassist', name: 'javassist', version: '3.21.0-GA'
 }
 
diff --git a/p3c-pmd/pom.xml b/p3c-pmd/pom.xml
index adee52f..cb947a3 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.1</version>
+  <version>1.3.2</version>
   <packaging>jar</packaging>  
   <name>p3c-pmd</name>  
   <properties>
-- 
GitLab