Skip to content

Commit

Permalink
[ISSUE #2992] Use new code style for nacos-naming (#3090)
Browse files Browse the repository at this point in the history
* Update check style to ignore spring bean java doc

* use new code style for nacos-naming
  • Loading branch information
KomachiSion authored Jun 17, 2020
1 parent f94e8f8 commit 67829bb
Show file tree
Hide file tree
Showing 123 changed files with 7,238 additions and 5,719 deletions.
51 changes: 25 additions & 26 deletions naming/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>nacos-naming</artifactId>
<packaging>jar</packaging>

<name>nacos-naming ${project.version}</name>
<url>http://nacos.io</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand All @@ -49,18 +49,18 @@
<groupId>${project.groupId}</groupId>
<artifactId>nacos-core</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nacos-api</artifactId>
</dependency>


<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>

<dependency>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>
Expand All @@ -69,7 +69,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand All @@ -87,12 +87,12 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand All @@ -101,37 +101,37 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>

<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>org.javatuples</groupId>
<artifactId>javatuples</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>

<!-- log -->
<!-- log4j通过slf4j来代理 -->
<dependency>
Expand All @@ -148,7 +148,7 @@
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nacos-cmdb</artifactId>
Expand All @@ -170,7 +170,7 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -200,7 +200,7 @@
<resource>
<directory>src/main/resources</directory>
<!--<excludes>-->
<!--<exclude>application.properties</exclude>-->
<!--<exclude>application.properties</exclude>-->
<!--</excludes>-->
</resource>
</resources>
Expand All @@ -213,5 +213,4 @@
</plugin>
</plugins>
</reporting>

</project>
10 changes: 4 additions & 6 deletions naming/src/main/java/com/alibaba/nacos/naming/NamingApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.alibaba.nacos.naming;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;

/**
* Hello world!
* Nacos naming starter.
*
* @author xxc
*/
@EnableScheduling
@SpringBootApplication(scanBasePackages = {
"com.alibaba.nacos.naming",
"com.alibaba.nacos.core"
})
@SpringBootApplication(scanBasePackages = {"com.alibaba.nacos.naming", "com.alibaba.nacos.core"})
public class NamingApp {

public static void main(String[] args) {
SpringApplication.run(NamingApp.class, args);
}
Expand Down
Loading

0 comments on commit 67829bb

Please sign in to comment.