Skip to content

Commit c188ba2

Browse files
myossmyoss
committed
feature: release to 2.0.1.RELEASE
1 parent 83685d6 commit c188ba2

File tree

6 files changed

+73
-37
lines changed

6 files changed

+73
-37
lines changed

‎code-format-checkstyle/pom.xml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,39 @@
66
<parent>
77
<groupId>app.myoss.cloud.codestyle</groupId>
88
<artifactId>java-code-style</artifactId>
9-
<version>2.0.0.RELEASE</version>
9+
<version>2.0.1.RELEASE</version>
1010
</parent>
1111

1212
<artifactId>code-format-checkstyle</artifactId>
1313
<name>code-format-checkstyle</name>
1414

15+
<description>myoss open source project, code style &amp; format written in Java</description>
16+
<url>https://github.com/myoss-cloud/java-code-style</url>
17+
<inceptionYear>2018</inceptionYear>
18+
19+
<scm>
20+
<url>https://github.com/myoss-cloud/java-code-style</url>
21+
<connection>scm:git:https://github.com/myoss-cloud/java-code-style.git</connection>
22+
</scm>
23+
24+
<licenses>
25+
<license>
26+
<name>Apache 2</name>
27+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
28+
<distribution>repo</distribution>
29+
<comments>A business-friendly OSS license</comments>
30+
</license>
31+
</licenses>
32+
33+
<developers>
34+
<developer>
35+
<name>Jerry.Chen</name>
36+
<email>jerry.work@aliyun.com</email>
37+
<organizationUrl>https://github.com/myoss-cloud</organizationUrl>
38+
<url>https://github.com/myoss</url>
39+
</developer>
40+
</developers>
41+
1542
<properties>
1643
</properties>
1744

‎code-format-eclipse/pom.xml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,39 @@
66
<parent>
77
<groupId>app.myoss.cloud.codestyle</groupId>
88
<artifactId>java-code-style</artifactId>
9-
<version>2.0.0.RELEASE</version>
9+
<version>2.0.1.RELEASE</version>
1010
</parent>
1111

1212
<artifactId>code-format-eclipse</artifactId>
1313
<name>code-format-eclipse</name>
1414

15+
<description>myoss open source project, code style &amp; format written in Java</description>
16+
<url>https://github.com/myoss-cloud/java-code-style</url>
17+
<inceptionYear>2018</inceptionYear>
18+
19+
<scm>
20+
<url>https://github.com/myoss-cloud/java-code-style</url>
21+
<connection>scm:git:https://github.com/myoss-cloud/java-code-style.git</connection>
22+
</scm>
23+
24+
<licenses>
25+
<license>
26+
<name>Apache 2</name>
27+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
28+
<distribution>repo</distribution>
29+
<comments>A business-friendly OSS license</comments>
30+
</license>
31+
</licenses>
32+
33+
<developers>
34+
<developer>
35+
<name>Jerry.Chen</name>
36+
<email>jerry.work@aliyun.com</email>
37+
<organizationUrl>https://github.com/myoss-cloud</organizationUrl>
38+
<url>https://github.com/myoss</url>
39+
</developer>
40+
</developers>
41+
1542
<properties>
1643
</properties>
1744

‎code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/JavaCodeFormatter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import app.myoss.cloud.code.format.eclipse.imports.ImportsSorter;
4848
import app.myoss.cloud.code.format.eclipse.utils.FileUtils;
4949
import app.myoss.cloud.code.format.eclipse.utils.ImportsUtils;
50-
import app.myoss.cloud.core.constants.PhoenixConstants;
50+
import app.myoss.cloud.core.constants.MyossConstants;
5151
import app.myoss.cloud.core.exception.BizRuntimeException;
5252
import lombok.extern.slf4j.Slf4j;
5353

@@ -176,14 +176,14 @@ public boolean formatFile(String filePath) {
176176
StringBuilder fileContent = new StringBuilder();
177177
File sourceFile = new File(filePath);
178178
try {
179-
Files.asCharSource(sourceFile, PhoenixConstants.DEFAULT_CHARSET).copyTo(fileContent);
179+
Files.asCharSource(sourceFile, MyossConstants.DEFAULT_CHARSET).copyTo(fileContent);
180180
} catch (IOException ex) {
181181
throw new BizRuntimeException("read file: " + filePath, ex);
182182
}
183183

184184
try {
185185
String formatted = formatText(fileContent);
186-
Files.asCharSink(sourceFile, PhoenixConstants.DEFAULT_CHARSET).write(formatted);
186+
Files.asCharSink(sourceFile, MyossConstants.DEFAULT_CHARSET).write(formatted);
187187
return true;
188188
} catch (Exception ex) {
189189
log.error("format by eclipse formatter failed: " + filePath, ex);

‎code-format-eclipse/src/main/java/app/myoss/cloud/code/format/eclipse/utils/ImportsUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Set;
2929
import java.util.TreeMap;
3030

31-
import app.myoss.cloud.core.constants.PhoenixConstants;
31+
import app.myoss.cloud.core.constants.MyossConstants;
3232
import app.myoss.cloud.core.exception.BizRuntimeException;
3333
import app.myoss.cloud.core.lang.io.StreamUtil;
3434
import lombok.AccessLevel;
@@ -155,7 +155,7 @@ public static Properties readPropertiesFile(String file) {
155155
Properties formatterOptions;
156156
try (InputStream stream = ImportsUtils.class.getClassLoader().getResourceAsStream(file)) {
157157
formatterOptions = new Properties();
158-
String s = StreamUtil.copyToString(stream, PhoenixConstants.DEFAULT_CHARSET);
158+
String s = StreamUtil.copyToString(stream, MyossConstants.DEFAULT_CHARSET);
159159
StringReader reader = new StringReader(s.replace("=\\#", "=#"));
160160
formatterOptions.load(reader);
161161
} catch (IOException ex) {

‎code-format-eclipse/src/test/java/app/myoss/cloud/code/format/eclipse/JavaCodeFormatterTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void compareEclipseCodeFormatConfigFileTest1() {
9999
log.info("不同属性 path2: {} \n{}", path2, JSON.toJSONString(properties2, true));
100100
}
101101

102-
public static String getRootOutputPath(String childDirectorName, boolean isPhoenixCoreSrc) {
102+
public static String getRootOutputPath(String childDirectorName, boolean isMyossStarterProjectsSrc) {
103103
Objects.requireNonNull(childDirectorName);
104104
Path targetFolder;
105105
try {
@@ -108,11 +108,11 @@ public static String getRootOutputPath(String childDirectorName, boolean isPhoen
108108
throw new BizRuntimeException(ex);
109109
}
110110
Objects.requireNonNull(targetFolder);
111-
if (isPhoenixCoreSrc) {
111+
if (isMyossStarterProjectsSrc) {
112112
return targetFolder.getParent()
113113
.getParent()
114114
.getParent()
115-
.resolve("myoss-cloud-projects")
115+
.resolve("myoss-starter-projects")
116116
.resolve(childDirectorName)
117117
.toString();
118118
} else {

‎pom.xml

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
<parent>
77
<groupId>app.myoss.cloud</groupId>
88
<artifactId>spring-boot-parent</artifactId>
9-
<version>2.0.0.RELEASE</version>
9+
<version>2.0.1.RELEASE</version>
1010
</parent>
1111

1212
<groupId>app.myoss.cloud.codestyle</groupId>
1313
<artifactId>java-code-style</artifactId>
1414
<name>java-code-style</name>
15-
<version>2.0.0.RELEASE</version>
15+
<version>2.0.1.RELEASE</version>
1616
<packaging>pom</packaging>
1717

1818
<description>myoss open source project, code style &amp; format written in Java</description>
19-
<url>https://github.com/myoss/java-code-style</url>
19+
<url>https://github.com/myoss-cloud/java-code-style</url>
2020
<inceptionYear>2018</inceptionYear>
2121

2222
<scm>
23-
<url>https://github.com/myoss/java-code-style</url>
24-
<connection>scm:git:https://github.com/myoss/java-code-style.git</connection>
23+
<url>https://github.com/myoss-cloud/java-code-style</url>
24+
<connection>scm:git:https://github.com/myoss-cloud/java-code-style.git</connection>
2525
</scm>
2626

2727
<licenses>
@@ -37,15 +37,12 @@
3737
<developer>
3838
<name>Jerry.Chen</name>
3939
<email>jerry.work@aliyun.com</email>
40-
<organizationUrl>https://github.com/myoss</organizationUrl>
40+
<organizationUrl>https://github.com/myoss-cloud</organizationUrl>
41+
<url>https://github.com/myoss</url>
4142
</developer>
4243
</developers>
4344

4445
<properties>
45-
<!-- myoss cloud -->
46-
<myoss-cloud.java-code-style.version>2.0.0.RELEASE</myoss-cloud.java-code-style.version>
47-
<!-- myoss cloud -->
48-
4946
<!-- third party -->
5047
<puppycrawl-tools-checkstyle.version>8.10</puppycrawl-tools-checkstyle.version>
5148
<spring-javaformat-checkstyle.version>0.0.5</spring-javaformat-checkstyle.version>
@@ -60,24 +57,9 @@
6057
<dependencies>
6158
<!-- myoss cloud dependencies start -->
6259
<dependency>
63-
<groupId>app.myoss.cloud</groupId>
64-
<artifactId>myoss-cloud-core</artifactId>
60+
<groupId>app.myoss.cloud.boot</groupId>
61+
<artifactId>myoss-starter-core</artifactId>
6562
</dependency>
6663
<!-- myoss cloud dependencies end -->
6764
</dependencies>
68-
69-
<dependencyManagement>
70-
<dependencies>
71-
<dependency>
72-
<groupId>app.myoss.cloud.codestyle</groupId>
73-
<artifactId>code-format-eclipse</artifactId>
74-
<version>${myoss-cloud.java-code-style.version}</version>
75-
</dependency>
76-
<dependency>
77-
<groupId>app.myoss.cloud.codestyle</groupId>
78-
<artifactId>code-format-checkstyle</artifactId>
79-
<version>${myoss-cloud.java-code-style.version}</version>
80-
</dependency>
81-
</dependencies>
82-
</dependencyManagement>
8365
</project>

0 commit comments

Comments
 (0)