feature: release to 2.0.0.RELEASE, change groupId to app.myoss.cloud.codestyle and artifactId to java-code-style

myoss · myoss · commit 83685d69a2e4 · 2018-08-31T11:40:22.000+08:00
diff --git a/README.md b/README.md
@@ -1,45 +1,45 @@
-# phoenix-code-format
+# java-code-style
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.github.myoss.checkstyle/code-format-parent.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.myoss.checkstyle/code-format-parent/)
-[![GitHub release](https://img.shields.io/github/release/myoss-cloud/phoenix-code-format.svg)](https://github.com/myoss-cloud/phoenix-code-format/releases)
+[![Maven Central](https://img.shields.io/maven-central/v/app.myoss.cloud.codestyle/java-code-style.svg)](https://maven-badges.herokuapp.com/maven-central/app.myoss.cloud.codestyle/java-code-style/)
+[![GitHub release](https://img.shields.io/github/release/myoss-cloud/java-code-style.svg)](https://github.com/myoss-cloud/java-code-style/releases)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
 ## Documentation
 
-- [Documentation Home](https://github.com/myoss-cloud/phoenix-code-format/wiki)
+- [Documentation Home](https://github.com/myoss-cloud/java-code-style/wiki)
 
 ## Download
 
 ### code-format-eclipse
 
 - [maven][1]
-- [the latest JAR][2]  
+- [the latest JAR][2]
 
-[1]: http://repo1.maven.org/maven2/com/github/myoss/checkstyle/code-format-eclipse/  
-[2]: https://search.maven.org/remote_content?g=com.github.myoss.checkstyle&a=code-format-eclipse&v=LATEST
+[1]: http://repo1.maven.org/maven2/app/myoss/cloud/codestyle/code-format-eclipse/  
+[2]: https://search.maven.org/remote_content?g=app.myoss.cloud.codestyle&a=code-format-eclipse&v=LATEST
 
 ### code-format-checkstyle
 
 - [maven][3]
-- [the latest JAR][4]  
+- [the latest JAR][4]
 
-[3]: http://repo1.maven.org/maven2/com/github/myoss/checkstyle/code-format-checkstyle/  
-[4]: https://search.maven.org/remote_content?g=com.github.myoss.checkstyle&a=code-format-checkstyle&v=LATEST
+[3]: http://repo1.maven.org/maven2/app/myoss/cloud/codestyle/code-format-checkstyle/  
+[4]: https://search.maven.org/remote_content?g=app.myoss.cloud.codestyle&a=code-format-checkstyle&v=LATEST
 
 ## Maven
 
 ```xml
 <dependency>
-    <groupId>com.github.myoss.checkstyle</groupId>
+    <groupId>app.myoss.cloud.codestyle</groupId>
     <artifactId>code-format-eclipse</artifactId>
-    <version>1.0.1.RELEASE</version>
+    <version>2.0.0.RELEASE</version>
 </dependency>
 ```
 
 ```xml
 <dependency>
-    <groupId>com.github.myoss.checkstyle</groupId>
+    <groupId>app.myoss.cloud.codestyle</groupId>
     <artifactId>code-format-checkstyle</artifactId>
-    <version>1.0.1.RELEASE</version>
+    <version>2.0.0.RELEASE</version>
 </dependency>
 ```
diff --git a/code-format-checkstyle/pom.xml b/code-format-checkstyle/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.github.myoss.checkstyle</groupId>
-        <artifactId>code-format-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <groupId>app.myoss.cloud.codestyle</groupId>
+        <artifactId>java-code-style</artifactId>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
     <artifactId>code-format-checkstyle</artifactId>
diff --git a/code-format-checkstyle/src/main/java/app/myoss/cloud/code/check/TempDocumentFile.java b/code-format-checkstyle/src/main/java/app/myoss/cloud/code/check/TempDocumentFile.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.github.myoss.phoenix.code.check;
+package app.myoss.cloud.code.check;
 
 /**
  * 用于生成 Java Doc，目前项目没有代码
diff --git a/code-format-checkstyle/src/main/java/app/myoss/cloud/code/check/package-info.java b/code-format-checkstyle/src/main/java/app/myoss/cloud/code/check/package-info.java
@@ -21,4 +21,4 @@
  * @author Jerry.Chen
  * @since 2018年7月19日 下午1:35:34
  */
-package com.github.myoss.phoenix.code.check;
+package app.myoss.cloud.code.check;
diff --git a/code-format-eclipse/pom.xml b/code-format-eclipse/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.github.myoss.checkstyle</groupId>
-        <artifactId>code-format-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <groupId>app.myoss.cloud.codestyle</groupId>
+        <artifactId>java-code-style</artifactId>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
     <artifactId>code-format-eclipse</artifactId>
diff --git a/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/JavaCodeFormatter.java b/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/JavaCodeFormatter.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.github.myoss.phoenix.code.format.eclipse;
+package app.myoss.cloud.code.format.eclipse;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,13 +42,13 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.text.edits.TextEdit;
 
-import com.github.myoss.phoenix.code.format.eclipse.imports.ImportsSorter;
-import com.github.myoss.phoenix.code.format.eclipse.utils.FileUtils;
-import com.github.myoss.phoenix.code.format.eclipse.utils.ImportsUtils;
-import com.github.myoss.phoenix.core.constants.PhoenixConstants;
-import com.github.myoss.phoenix.core.exception.BizRuntimeException;
 import com.google.common.io.Files;
 
+import app.myoss.cloud.code.format.eclipse.imports.ImportsSorter;
+import app.myoss.cloud.code.format.eclipse.utils.FileUtils;
+import app.myoss.cloud.code.format.eclipse.utils.ImportsUtils;
+import app.myoss.cloud.core.constants.PhoenixConstants;
+import app.myoss.cloud.core.exception.BizRuntimeException;
 import lombok.extern.slf4j.Slf4j;
 
 /**
diff --git a/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/imports/ImportsSorter.java b/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/imports/ImportsSorter.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.github.myoss.phoenix.code.format.eclipse.imports;
+package app.myoss.cloud.code.format.eclipse.imports;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/imports/impl/ImportsComparator.java b/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/imports/impl/ImportsComparator.java
@@ -15,14 +15,13 @@
  *
  */
 
-package com.github.myoss.phoenix.code.format.eclipse.imports.impl;
+package app.myoss.cloud.code.format.eclipse.imports.impl;
 
 import java.util.Comparator;
 
 import org.apache.commons.lang3.ClassUtils;
 
-import com.github.myoss.phoenix.code.format.eclipse.utils.ImportsUtils;
-
+import app.myoss.cloud.code.format.eclipse.utils.ImportsUtils;
 import lombok.extern.slf4j.Slf4j;
 
 /**
diff --git a/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/imports/impl/ImportsSorter450.java b/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/imports/impl/ImportsSorter450.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.github.myoss.phoenix.code.format.eclipse.imports.impl;
+package app.myoss.cloud.code.format.eclipse.imports.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,10 +24,11 @@
 import java.util.List;
 import java.util.Set;
 
-import com.github.myoss.phoenix.code.format.eclipse.imports.ImportsSorter;
-import com.github.myoss.phoenix.code.format.eclipse.utils.ImportsUtils;
 import com.google.common.collect.ArrayListMultimap;
 
+import app.myoss.cloud.code.format.eclipse.imports.ImportsSorter;
+import app.myoss.cloud.code.format.eclipse.utils.ImportsUtils;
+
 /**
  * Java import代码格式化工具
  *
diff --git a/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/imports/impl/ImportsSorter452.java b/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/imports/impl/ImportsSorter452.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.github.myoss.phoenix.code.format.eclipse.imports.impl;
+package app.myoss.cloud.code.format.eclipse.imports.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,10 +25,11 @@
 import java.util.List;
 import java.util.Set;
 
-import com.github.myoss.phoenix.code.format.eclipse.imports.ImportsSorter;
-import com.github.myoss.phoenix.code.format.eclipse.utils.ImportsUtils;
 import com.google.common.collect.ArrayListMultimap;
 
+import app.myoss.cloud.code.format.eclipse.imports.ImportsSorter;
+import app.myoss.cloud.code.format.eclipse.utils.ImportsUtils;
+
 /**
  * Java import代码格式化工具
  *
diff --git a/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/utils/FileUtils.java b/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/utils/FileUtils.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.github.myoss.phoenix.code.format.eclipse.utils;
+package app.myoss.cloud.code.format.eclipse.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -30,7 +30,7 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.github.myoss.phoenix.core.exception.BizRuntimeException;
+import app.myoss.cloud.core.exception.BizRuntimeException;
 
 /**
  * 文件工具类
diff --git a/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/utils/ImportsUtils.java b/code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/utils/ImportsUtils.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.github.myoss.phoenix.code.format.eclipse.utils;
+package app.myoss.cloud.code.format.eclipse.utils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,10 +28,9 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import com.github.myoss.phoenix.core.constants.PhoenixConstants;
-import com.github.myoss.phoenix.core.exception.BizRuntimeException;
-import com.github.myoss.phoenix.core.lang.io.StreamUtil;
-
+import app.myoss.cloud.core.constants.PhoenixConstants;
+import app.myoss.cloud.core.exception.BizRuntimeException;
+import app.myoss.cloud.core.lang.io.StreamUtil;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
diff --git a/code-format-eclipse/src/test/java/app/myoss/cloud/code/format/eclipse/JavaCodeFormatterTests.java b/code-format-eclipse/src/test/java/app/myoss/cloud/code/format/eclipse/JavaCodeFormatterTests.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.github.myoss.phoenix.code.format.eclipse;
+package app.myoss.cloud.code.format.eclipse;
 
 import java.net.URISyntaxException;
 import java.nio.file.Path;
@@ -32,13 +32,13 @@
 import org.junit.Test;
 
 import com.alibaba.fastjson.JSON;
-import com.github.myoss.phoenix.code.format.eclipse.imports.ImportsSorter;
-import com.github.myoss.phoenix.code.format.eclipse.imports.impl.ImportsComparator;
-import com.github.myoss.phoenix.code.format.eclipse.imports.impl.ImportsSorter452;
-import com.github.myoss.phoenix.code.format.eclipse.utils.FileUtils;
-import com.github.myoss.phoenix.code.format.eclipse.utils.ImportsUtils;
-import com.github.myoss.phoenix.core.exception.BizRuntimeException;
 
+import app.myoss.cloud.code.format.eclipse.imports.ImportsSorter;
+import app.myoss.cloud.code.format.eclipse.imports.impl.ImportsComparator;
+import app.myoss.cloud.code.format.eclipse.imports.impl.ImportsSorter452;
+import app.myoss.cloud.code.format.eclipse.utils.FileUtils;
+import app.myoss.cloud.code.format.eclipse.utils.ImportsUtils;
+import app.myoss.cloud.core.exception.BizRuntimeException;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -112,7 +112,7 @@ public static String getRootOutputPath(String childDirectorName, boolean isPhoen
             return targetFolder.getParent()
                     .getParent()
                     .getParent()
-                    .resolve("phoenix-core")
+                    .resolve("myoss-cloud-projects")
                     .resolve(childDirectorName)
                     .toString();
         } else {
diff --git a/pom.xml b/pom.xml
@@ -4,24 +4,24 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.github.myoss</groupId>
-        <artifactId>phoenix-parent</artifactId>
-        <version>1.1.2.RELEASE</version>
+        <groupId>app.myoss.cloud</groupId>
+        <artifactId>spring-boot-parent</artifactId>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
-    <groupId>com.github.myoss.checkstyle</groupId>
-    <artifactId>code-format-parent</artifactId>
-    <name>code-format-parent</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <groupId>app.myoss.cloud.codestyle</groupId>
+    <artifactId>java-code-style</artifactId>
+    <name>java-code-style</name>
+    <version>2.0.0.RELEASE</version>
     <packaging>pom</packaging>
 
-    <description>myoss open source project, phoenix code format written in Java</description>
-    <url>https://github.com/myoss/phoenix-code-format</url>
+    <description>myoss open source project, code style &amp; format written in Java</description>
+    <url>https://github.com/myoss/java-code-style</url>
     <inceptionYear>2018</inceptionYear>
 
     <scm>
-        <url>https://github.com/myoss/phoenix-code-format</url>
-        <connection>scm:git:https://github.com/myoss/phoenix-code-format.git</connection>
+        <url>https://github.com/myoss/java-code-style</url>
+        <connection>scm:git:https://github.com/myoss/java-code-style.git</connection>
     </scm>
 
     <licenses>
@@ -36,15 +36,14 @@
     <developers>
         <developer>
             <name>Jerry.Chen</name>
-            <email>jerry.myoss@gmail.com</email>
+            <email>jerry.work@aliyun.com</email>
             <organizationUrl>https://github.com/myoss</organizationUrl>
         </developer>
     </developers>
 
     <properties>
         <!-- myoss cloud -->
-        <phoenix-code-format.version>1.0.2-SNAPSHOT</phoenix-code-format.version>
-        <phoenix-core.version>1.1.2.RELEASE</phoenix-core.version>
+        <myoss-cloud.java-code-style.version>2.0.0.RELEASE</myoss-cloud.java-code-style.version>
         <!-- myoss cloud -->
 
         <!-- third party -->
@@ -54,31 +53,30 @@
     </properties>
 
     <modules>
-    <module>code-format-eclipse</module>
-    <module>code-format-checkstyle</module>
+        <module>code-format-eclipse</module>
+        <module>code-format-checkstyle</module>
     </modules>
 
     <dependencies>
         <!-- myoss cloud dependencies start -->
         <dependency>
-            <groupId>com.github.myoss</groupId>
-            <artifactId>phoenix-core</artifactId>
-            <version>${phoenix-core.version}</version>
+            <groupId>app.myoss.cloud</groupId>
+            <artifactId>myoss-cloud-core</artifactId>
         </dependency>
         <!-- myoss cloud dependencies end -->
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>com.github.myoss.checkstyle</groupId>
+                <groupId>app.myoss.cloud.codestyle</groupId>
                 <artifactId>code-format-eclipse</artifactId>
-                <version>${phoenix-code-format.version}</version>
+                <version>${myoss-cloud.java-code-style.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.github.myoss.checkstyle</groupId>
+                <groupId>app.myoss.cloud.codestyle</groupId>
                 <artifactId>code-format-checkstyle</artifactId>
-                <version>${phoenix-code-format.version}</version>
+                <version>${myoss-cloud.java-code-style.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-package com.github.myoss.phoenix.code.check;`
	`18`	`+package app.myoss.cloud.code.check;`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* 用于生成 Java Doc，目前项目没有代码`