diff --git a/api/pom.xml b/api/pom.xml index 9756bb165..eb5a663dc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,55 +12,55 @@ limitations under the License. --> - - com.alibaba.nacos - nacos-all - 0.6.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + com.alibaba.nacos + nacos-all + 0.6.0 + - 4.0.0 + 4.0.0 - nacos-api - jar + nacos-api + jar - nacos-api ${project.version} - http://maven.apache.org - - - - org.apache.maven.plugins - maven-compiler-plugin - - 7 - 7 - - - - + nacos-api ${project.version} + http://maven.apache.org + + + + org.apache.maven.plugins + maven-compiler-plugin + + 7 + 7 + + + + - - UTF-8 - + + UTF-8 + - - - com.alibaba - fastjson - - - org.apache.commons - commons-lang3 - - - junit - junit - test - - - org.springframework - spring-test - test - - + + + com.alibaba + fastjson + + + org.apache.commons + commons-lang3 + + + junit + junit + test + + + org.springframework + spring-test + test + + diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java b/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java index d094a645c..10430345d 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java @@ -66,8 +66,8 @@ public class ParseException extends Exception { } /** - * @return One of the following base on the value of errorType: ERROR_UNEXPECTED_CHAR java.lang.Character - * ERROR_UNEXPECTED_TOKEN com.alibaba.nacos.client.logger.jsonparser.Yytoken ERROR_UNEXPECTED_EXCEPTION + * @return One of the following base on the value of errorType: ERROR_UNEXPECTED_CHAR java.lang.Character + * ERROR_UNEXPECTED_TOKEN com.alibaba.nacos.client.logger.jsonparser.Yytoken ERROR_UNEXPECTED_EXCEPTION * java.lang.Exception * @see com.alibaba.nacos.client.logger.json.parser.Yytoken */ diff --git a/config/pom.xml b/config/pom.xml index 44a5f1318..0dadee126 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -12,175 +12,175 @@ limitations under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - com.alibaba.nacos - nacos-all - 0.6.0 - + + com.alibaba.nacos + nacos-all + 0.6.0 + - 4.0.0 + 4.0.0 - nacos-config - jar + nacos-config + jar - nacos-config ${project.version} - http://maven.apache.org + nacos-config ${project.version} + http://maven.apache.org - - UTF-8 - + + UTF-8 + - - - junit - junit - test - - - org.springframework.boot - spring-boot-starter-web - - - ${project.groupId} - nacos-core - - - com.google.guava - guava - - - - - - - org.springframework.boot - spring-boot-starter-jdbc - - - commons-io - commons-io - - - commons-lang - commons-lang - 2.6 - - - mysql - mysql-connector-java - - - commons-dbcp - commons-dbcp - - - org.apache.derby - derby - - - ch.qos.logback - logback-classic - + + + junit + junit + test + + + org.springframework.boot + spring-boot-starter-web + + + ${project.groupId} + nacos-core + + + com.google.guava + guava + + + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + commons-io + commons-io + + + commons-lang + commons-lang + 2.6 + + + mysql + mysql-connector-java + + + commons-dbcp + commons-dbcp + + + org.apache.derby + derby + + + ch.qos.logback + logback-classic + - - - org.aspectj - aspectjrt - - - cglib - cglib-nodep - - - org.apache.httpcomponents - httpasyncclient - - - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.codehaus.jackson - jackson-mapper-lgpl - - - net.jcip - jcip-annotations - true - - - com.github.spotbugs - spotbugs-annotations - - - org.mockito - mockito-core - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - -Dnacos.standalone=true - - - - org.apache.maven.plugins - maven-assembly-plugin - - - - com.alibaba.nacos.config.server.Config - - - - jar-with-dependencies - - - - - - - - - springboot - - - com.alibaba.nacos - nacos-core - - - - - - org.springframework.boot - spring-boot-maven-plugin - - com.alibaba.nacos.config.server.Config - - - - nacos-config - - - + + + org.aspectj + aspectjrt + + + cglib + cglib-nodep + + + org.apache.httpcomponents + httpasyncclient + + + + + org.springframework.boot + spring-boot-starter-tomcat + + + org.codehaus.jackson + jackson-mapper-lgpl + + + net.jcip + jcip-annotations + true + + + com.github.spotbugs + spotbugs-annotations + + + org.mockito + mockito-core + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + -Dnacos.standalone=true + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + com.alibaba.nacos.config.server.Config + + + + jar-with-dependencies + + + + + + + + + springboot + + + com.alibaba.nacos + nacos-core + + + + + + org.springframework.boot + spring-boot-maven-plugin + + com.alibaba.nacos.config.server.Config + + + + nacos-config + + + diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java index f16a1289c..4dcb10d52 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java @@ -24,6 +24,7 @@ import javax.servlet.ServletContext; /** * Running config + * * @author nkorange */ @Component @@ -32,18 +33,18 @@ public class RunningConfigUtils implements ApplicationListener list = new ArrayList(); @@ -46,12 +44,12 @@ public class AggrWhitelistTest { list.add("NS_NACOS_SUBSCRIPTION_TOPIC_*"); list.add("com.taobao.tae.AppListOnGrid-*"); service.compile(list); - + assertEquals(false, service.isAggrDataId("com.abc")); assertEquals(false, service.isAggrDataId("com.taobao.jiuren")); assertEquals(false, service.isAggrDataId("com.taobao.jiurenABC")); assertEquals(true, service.isAggrDataId("com.taobao.jiuren.abc")); assertEquals(true, service.isAggrDataId("NS_NACOS_SUBSCRIPTION_TOPIC_abc")); assertEquals(true, service.isAggrDataId("com.taobao.tae.AppListOnGrid-abc")); - } + } } diff --git a/config/src/test/java/com/alibaba/nacos/config/server/service/ClientTrackServiceTest.java b/config/src/test/java/com/alibaba/nacos/config/server/service/ClientTrackServiceTest.java index e792df201..c5ec39dac 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/service/ClientTrackServiceTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/service/ClientTrackServiceTest.java @@ -15,19 +15,14 @@ */ package com.alibaba.nacos.config.server.service; +import com.alibaba.nacos.config.server.utils.GroupKey2; import org.junit.Assert; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; -import com.alibaba.nacos.config.server.service.ClientTrackService; -import com.alibaba.nacos.config.server.service.ConfigService; -import com.alibaba.nacos.config.server.utils.GroupKey2; - - @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration public class ClientTrackServiceTest { @@ -44,7 +39,7 @@ public class ClientTrackServiceTest { String group = "online"; String groupKey = GroupKey2.getKey(dataId, group); String md5 = "xxxxxxxxxxxxx"; - + ConfigService.updateMd5(groupKey, md5, System.currentTimeMillis()); ClientTrackService.trackClientMd5(clientIp, groupKey, md5); @@ -53,7 +48,7 @@ public class ClientTrackServiceTest { Assert.assertEquals(true, ClientTrackService.isClientUptodate(clientIp).get(groupKey)); Assert.assertEquals(1, ClientTrackService.subscribeClientCount()); Assert.assertEquals(1, ClientTrackService.subscriberCount()); - + //服务端数据更新 ConfigService.updateMd5(groupKey, md5 + "111", System.currentTimeMillis()); Assert.assertEquals(false, ClientTrackService.isClientUptodate(clientIp).get(groupKey)); diff --git a/config/src/test/java/com/alibaba/nacos/config/server/service/DiskServiceUnitTest.java b/config/src/test/java/com/alibaba/nacos/config/server/service/DiskServiceUnitTest.java index 93382ec8f..6863ed5e9 100755 --- a/config/src/test/java/com/alibaba/nacos/config/server/service/DiskServiceUnitTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/service/DiskServiceUnitTest.java @@ -17,50 +17,46 @@ package com.alibaba.nacos.config.server.service; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; -import com.alibaba.nacos.config.server.service.DiskUtil; - import javax.servlet.ServletContext; - -import static org.junit.Assert.assertEquals; - import java.io.File; import java.io.IOException; +import static org.junit.Assert.assertEquals; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration public class DiskServiceUnitTest { - private DiskUtil diskService; + private DiskUtil diskService; - private ServletContext servletContext; + private ServletContext servletContext; - private File tempFile; + private File tempFile; - private String path; + private String path; - @Before - public void setUp() throws IOException { - this.tempFile = File.createTempFile("diskServiceTest", "tmp"); - this.path = tempFile.getParent(); - this.diskService = new DiskUtil(); - } + @Before + public void setUp() throws IOException { + this.tempFile = File.createTempFile("diskServiceTest", "tmp"); + this.path = tempFile.getParent(); + this.diskService = new DiskUtil(); + } - @Test - public void testCreateConfig() throws IOException { - diskService.saveToDisk("testDataId", "testGroup", "testTenant", "testContent"); - String content = diskService.getConfig("testDataId", "testGroup", "testTenant"); - assertEquals(content, "testContent"); + @Test + public void testCreateConfig() throws IOException { + diskService.saveToDisk("testDataId", "testGroup", "testTenant", "testContent"); + String content = diskService.getConfig("testDataId", "testGroup", "testTenant"); + assertEquals(content, "testContent"); - } + } - @After - public void tearDown() throws IOException { - tempFile.delete(); - } + @After + public void tearDown() throws IOException { + tempFile.delete(); + } } diff --git a/config/src/test/java/com/alibaba/nacos/config/server/utils/GroupKeyTest.java b/config/src/test/java/com/alibaba/nacos/config/server/utils/GroupKeyTest.java index 412d1074a..56077cc2e 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/utils/GroupKeyTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/utils/GroupKeyTest.java @@ -50,7 +50,7 @@ public class GroupKeyTest { } catch (IllegalArgumentException e) { System.out.println(e.toString()); } - + key = "11111%2b+222"; try { GroupKey2.parseKey(key); @@ -58,7 +58,6 @@ public class GroupKeyTest { } catch (IllegalArgumentException e) { System.out.println(e.toString()); } - key = "11111%25+222"; String[] pair = GroupKey2.parseKey(key); diff --git a/config/src/test/java/com/alibaba/nacos/config/server/utils/SimpleReadWriteLockTest.java b/config/src/test/java/com/alibaba/nacos/config/server/utils/SimpleReadWriteLockTest.java index 9c15a2c72..591c2ba1d 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/utils/SimpleReadWriteLockTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/utils/SimpleReadWriteLockTest.java @@ -24,7 +24,6 @@ import org.springframework.test.context.web.WebAppConfiguration; import com.alibaba.nacos.config.server.utils.SimpleReadWriteLock; - @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration public class SimpleReadWriteLockTest { @@ -34,44 +33,44 @@ public class SimpleReadWriteLockTest { SimpleReadWriteLock lock = new SimpleReadWriteLock(); assertEquals(true, lock.tryReadLock()); assertEquals(true, lock.tryReadLock()); - + lock.releaseReadLock(); lock.releaseReadLock(); - + assertEquals(true, lock.tryWriteLock()); } - + @Test public void test_加写锁() { SimpleReadWriteLock lock = new SimpleReadWriteLock(); assertEquals(true, lock.tryWriteLock()); lock.releaseWriteLock(); } - + @Test public void test_双重写锁() { SimpleReadWriteLock lock = new SimpleReadWriteLock(); - + assertEquals(true, lock.tryWriteLock()); assertEquals(false, lock.tryWriteLock()); } - + @Test public void test_先读锁后写锁() { SimpleReadWriteLock lock = new SimpleReadWriteLock(); - + assertEquals(true, lock.tryReadLock()); assertEquals(false, lock.tryWriteLock()); } - + @Test public void test_双重读锁_释放一个_加写锁失败() { SimpleReadWriteLock lock = new SimpleReadWriteLock(); assertEquals(true, lock.tryReadLock()); assertEquals(true, lock.tryReadLock()); - + lock.releaseReadLock(); - + assertEquals(false, lock.tryWriteLock()); } } diff --git a/config/src/test/java/com/alibaba/nacos/config/server/utils/event/EventDispatcherTest.java b/config/src/test/java/com/alibaba/nacos/config/server/utils/event/EventDispatcherTest.java index c451e33fc..660f002e7 100755 --- a/config/src/test/java/com/alibaba/nacos/config/server/utils/event/EventDispatcherTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/utils/event/EventDispatcherTest.java @@ -32,7 +32,6 @@ import java.util.concurrent.CountDownLatch; import static org.junit.Assert.assertEquals; - @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration public class EventDispatcherTest { @@ -46,10 +45,10 @@ public class EventDispatcherTest { @Test public void testAddListener() throws Exception { final AbstractEventListener listener = new MockListener(); - + int vusers = 1000; final CountDownLatch latch = new CountDownLatch(vusers); - + for (int i = 0; i < vusers; ++i) { new Thread(new Runnable() { public void run() { @@ -58,33 +57,32 @@ public class EventDispatcherTest { } }).start(); } - + latch.await(); assertEquals(1, EventDispatcher.LISTENER_HUB.size()); } - + @Test public void testFireEvent() { EventDispatcher.fireEvent(new MockEvent()); assertEquals(0, MockListener.count); - + EventDispatcher.addEventListener(new MockListener()); - + EventDispatcher.fireEvent(new MockEvent()); assertEquals(1, MockListener.count); - + EventDispatcher.fireEvent(new MockEvent()); assertEquals(2, MockListener.count); } } - -class MockEvent implements Event { +class MockEvent implements Event { } class MockListener extends AbstractEventListener { static int count = 0; - + @Override public List> interest() { List> types = new ArrayList>(); diff --git a/console/pom.xml b/console/pom.xml index a9be88585..10857b724 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -12,37 +12,37 @@ limitations under the License. --> - 4.0.0 - - com.alibaba.nacos - nacos-all - 0.6.0 - - nacos-console - - jar - nacos-console ${project.version} - http://maven.apache.org - - UTF-8 - - + 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"> + 4.0.0 + + com.alibaba.nacos + nacos-all + 0.6.0 + + nacos-console + + jar + nacos-console ${project.version} + http://maven.apache.org + + UTF-8 + + - - ${project.groupId} - nacos-config - - - org.apache.tomcat.embed - tomcat-embed-jasper - 7.0.59 - - - ${project.groupId} - nacos-naming - + + ${project.groupId} + nacos-config + + + org.apache.tomcat.embed + tomcat-embed-jasper + 7.0.59 + + + ${project.groupId} + nacos-naming + @@ -59,42 +59,42 @@ org.slf4j jul-to-slf4j - - - org.mockito - mockito-core - test - - - - nacos-server - - - org.springframework.boot - spring-boot-maven-plugin - - com.alibaba.nacos.Nacos - - - - - repackage - - - - - - - - - - - - - - - - - - + + + org.mockito + mockito-core + test + + + + nacos-server + + + org.springframework.boot + spring-boot-maven-plugin + + com.alibaba.nacos.Nacos + + + + + repackage + + + + + + + + + + + + + + + + + + diff --git a/console/src/main/resources/diamond-server-logback.xml b/console/src/main/resources/diamond-server-logback.xml index 19ef3e7bb..ce4eddcf8 100755 --- a/console/src/main/resources/diamond-server-logback.xml +++ b/console/src/main/resources/diamond-server-logback.xml @@ -2,29 +2,29 @@ - ${user.home}/diamond/logs/dump.log - true - - ${user.home}/diamond/logs/dump.log.%d{yyyy-MM-dd}.%i - 2GB - 15 - 7GB - true - - - %date %level %msg%n%n - GBK - - + class="ch.qos.logback.core.rolling.RollingFileAppender"> + ${user.home}/diamond/logs/dump.log + true + + ${user.home}/diamond/logs/dump.log.%d{yyyy-MM-dd}.%i + 2GB + 15 + 7GB + true + + + %date %level %msg%n%n + GBK + + + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${user.home}/diamond/logs/pull.log true ${user.home}/diamond/logs/pull.log.%d{yyyy-MM-dd}.%i - 20MB + 20MB 15 128MB true @@ -35,29 +35,29 @@ - - ${user.home}/diamond/logs/fatal.log - true - - ${user.home}/diamond/logs/fatal.log.%d{yyyy-MM-dd}.%i - 20MB - 15 - 128MB - true - - - %date %level %msg%n%n - GBK - - + + ${user.home}/diamond/logs/fatal.log + true + + ${user.home}/diamond/logs/fatal.log.%d{yyyy-MM-dd}.%i + 20MB + 15 + 128MB + true + + + %date %level %msg%n%n + GBK + + + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${user.home}/diamond/logs/memory.log true ${user.home}/diamond/logs/memory.log.%d{yyyy-MM-dd}.%i - 20MB + 20MB 15 128MB true @@ -73,7 +73,7 @@ true ${user.home}/diamond/logs/pull-check.log.%d{yyyy-MM-dd}.%i - 1GB + 1GB 15 3GB true @@ -90,7 +90,7 @@ true ${user.home}/diamond/logs/acl.log.%d{yyyy-MM-dd}.%i - 50MB + 50MB 15 512MB true @@ -107,7 +107,7 @@ true ${user.home}/diamond/logs/client-request.log.%d{yyyy-MM-dd}.%i - 2GB + 2GB 15 7GB true @@ -124,7 +124,7 @@ true ${user.home}/diamond/logs/sdk-request.log.%d{yyyy-MM-dd}.%i - 1GB + 1GB 15 3GB true @@ -141,7 +141,7 @@ true ${user.home}/diamond/logs/trace.log.%d{yyyy-MM-dd}.%i - 2GB + 2GB 15 7GB true @@ -158,7 +158,7 @@ true ${user.home}/diamond/logs/notify.log.%d{yyyy-MM-dd}.%i - 1GB + 1GB 15 3GB true @@ -175,7 +175,7 @@ true ${user.home}/diamond/logs/app.log.%d{yyyy-MM-dd}.%i - 20MB + 20MB 15 128MB true @@ -185,78 +185,78 @@ GBK - + + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${user.home}/diamond/logs/diamondServer.log true ${user.home}/diamond/logs/diamondServer.log.%d{yyyy-MM-dd}.%i - 50MB + 50MB 15 512MB true %date %level %msg%n%n - GBK + GBK - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + diff --git a/distribution/pom.xml b/distribution/pom.xml index bef1c2c43..633e4ae2c 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -12,188 +12,188 @@ limitations under the License. --> + 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"> - - com.alibaba.nacos - nacos-all - 0.6.0 - ../pom.xml - + + com.alibaba.nacos + nacos-all + 0.6.0 + ../pom.xml + - 4.0.0 + 4.0.0 - nacos-distribution - nacos-distribution ${project.version} - pom + nacos-distribution + nacos-distribution ${project.version} + pom - - - com.alibaba.nacos - nacos-console - - - - - release-config - - - com.alibaba.nacos - nacos-config - - - - - - maven-assembly-plugin - - - release-config - - single - - package - - - release-config.xml - - false - - - - - - acm - - - - release-naming - - - com.alibaba.nacos - nacos-naming - - - - - - maven-assembly-plugin - - - release-naming - - single - - package - - - release-naming.xml - - false - - - - - - ans - - - - release-client - - - com.alibaba.nacos - nacos-client - - - - - - maven-assembly-plugin - - - release-client - - single - - package - - - release-client.xml - - false - - - - - - nacos-client - - - - release-core - - - com.alibaba.nacos - nacos-core - - - - - - maven-assembly-plugin - - - release-core - - single - - package - - - release-core.xml - - false - - - - - - nacos-core - - - - release-nacos - - - com.alibaba.nacos - nacos-console - - - - - - maven-assembly-plugin - 3.0.0 - - - release-nacos.xml - - - - - make-assembly - install - - single - - - - - - nacos - - - - \ No newline at end of file + + + com.alibaba.nacos + nacos-console + + + + + release-config + + + com.alibaba.nacos + nacos-config + + + + + + maven-assembly-plugin + + + release-config + + single + + package + + + release-config.xml + + false + + + + + + acm + + + + release-naming + + + com.alibaba.nacos + nacos-naming + + + + + + maven-assembly-plugin + + + release-naming + + single + + package + + + release-naming.xml + + false + + + + + + ans + + + + release-client + + + com.alibaba.nacos + nacos-client + + + + + + maven-assembly-plugin + + + release-client + + single + + package + + + release-client.xml + + false + + + + + + nacos-client + + + + release-core + + + com.alibaba.nacos + nacos-core + + + + + + maven-assembly-plugin + + + release-core + + single + + package + + + release-core.xml + + false + + + + + + nacos-core + + + + release-nacos + + + com.alibaba.nacos + nacos-console + + + + + + maven-assembly-plugin + 3.0.0 + + + release-nacos.xml + + + + + make-assembly + install + + single + + + + + + nacos + + + + diff --git a/distribution/release-client.xml b/distribution/release-client.xml index 003b44387..7e9cc6e30 100644 --- a/distribution/release-client.xml +++ b/distribution/release-client.xml @@ -14,62 +14,62 @@ limitations under the License. --> - client - false - - dir - tar.gz - zip - - - - ../ - - README.md - - + client + false + + dir + tar.gz + zip + + + + ../ + + README.md + + - - - conf/** - benchmark/* - - + + + conf/** + benchmark/* + + - - - bin/* - - 0755 - - + + + bin/* + + 0755 + + - - - LICENSE-BIN - LICENSE - - - NOTICE-BIN - NOTICE - - + + + LICENSE-BIN + LICENSE + + + NOTICE-BIN + NOTICE + + - - - true - - com.alibaba.nacos:nacos-client - - - lib/ - false - - - lib/ - - - - - + + + true + + com.alibaba.nacos:nacos-client + + + lib/ + false + + + lib/ + + + + + diff --git a/distribution/release-config.xml b/distribution/release-config.xml index 12b67b4c8..a8933febb 100644 --- a/distribution/release-config.xml +++ b/distribution/release-config.xml @@ -14,62 +14,62 @@ limitations under the License. --> - cfg - false - - dir - tar.gz - zip - - - - ../ - - README.md - - + cfg + false + + dir + tar.gz + zip + + + + ../ + + README.md + + - - - conf/** - benchmark/* - - + + + conf/** + benchmark/* + + - - - bin/* - - 0755 - - + + + bin/* + + 0755 + + - - - LICENSE-BIN - LICENSE - - - NOTICE-BIN - NOTICE - - + + + LICENSE-BIN + LICENSE + + + NOTICE-BIN + NOTICE + + - - - true - - com.alibaba.nacos:nacos-config - - - lib/ - false - - - lib/ - - - - - + + + true + + com.alibaba.nacos:nacos-config + + + lib/ + false + + + lib/ + + + + + diff --git a/distribution/release-core.xml b/distribution/release-core.xml index c63e59c9b..03c3cd239 100644 --- a/distribution/release-core.xml +++ b/distribution/release-core.xml @@ -14,61 +14,61 @@ limitations under the License. --> - core - false - - dir - tar.gz - zip - - - - ../ - - README.md - - + core + false + + dir + tar.gz + zip + + + + ../ + + README.md + + - - - conf/** - - + + + conf/** + + - - - bin/* - - 0755 - - + + + bin/* + + 0755 + + - - - LICENSE-BIN - LICENSE - - - NOTICE-BIN - NOTICE - - + + + LICENSE-BIN + LICENSE + + + NOTICE-BIN + NOTICE + + - - - true - - com.alibaba.nacos:nacos-core - - - lib/ - false - - - lib/ - - - - - + + + true + + com.alibaba.nacos:nacos-core + + + lib/ + false + + + lib/ + + + + + diff --git a/distribution/release-nacos.xml b/distribution/release-nacos.xml index ae2026898..0b358b23d 100644 --- a/distribution/release-nacos.xml +++ b/distribution/release-nacos.xml @@ -14,50 +14,50 @@ limitations under the License. --> - server-${project.version} - true - - dir - tar.gz - zip - - + server-${project.version} + true + + dir + tar.gz + zip + + - - - conf/** - - + + + conf/** + + - - - bin/* - - 0755 - - - - - LICENSE-BIN - LICENSE - - - NOTICE-BIN - NOTICE - - - - ../console/target/nacos-server.jar - /target/ - - + + + bin/* + + 0755 + + + + + LICENSE-BIN + LICENSE + + + NOTICE-BIN + NOTICE + + + + ../console/target/nacos-server.jar + /target/ + + - - - true - - com.alibaba.nacos:nacos-console - - - + + + true + + com.alibaba.nacos:nacos-console + + + diff --git a/distribution/release-naming.xml b/distribution/release-naming.xml index d513d5e66..5cfc20421 100644 --- a/distribution/release-naming.xml +++ b/distribution/release-naming.xml @@ -14,62 +14,62 @@ limitations under the License. --> - naming - false - - dir - tar.gz - zip - - - - ../ - - README.md - - + naming + false + + dir + tar.gz + zip + + + + ../ + + README.md + + - - - conf/** - benchmark/* - - + + + conf/** + benchmark/* + + - - - bin/* - - 0755 - - + + + bin/* + + 0755 + + - - - LICENSE-BIN - LICENSE - - - NOTICE-BIN - NOTICE - - + + + LICENSE-BIN + LICENSE + + + NOTICE-BIN + NOTICE + + - - - true - - com.alibaba.nacos:nacos-naming - - - lib/ - false - - - lib/ - - - - - + + + true + + com.alibaba.nacos:nacos-naming + + + lib/ + false + + + lib/ + + + + + diff --git a/example/pom.xml b/example/pom.xml index 65e11a166..c03356812 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -12,50 +12,50 @@ limitations under the License. --> + 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"> - - com.alibaba.nacos - nacos-all - 0.6.0 - ../pom.xml - + + com.alibaba.nacos + nacos-all + 0.6.0 + ../pom.xml + - 4.0.0 + 4.0.0 - nacos-example - jar + nacos-example + jar - nacos-example ${project.version} - http://maven.apache.org + nacos-example ${project.version} + http://maven.apache.org - - UTF-8 - + + UTF-8 + - - - junit - junit - test - - - ${project.groupId} - nacos-common - - - ${project.groupId} - nacos-core - - - com.alibaba.nacos - nacos-client - - - - ch.qos.logback - logback-classic - - + + + junit + junit + test + + + ${project.groupId} + nacos-common + + + ${project.groupId} + nacos-core + + + com.alibaba.nacos + nacos-client + + + + ch.qos.logback + logback-classic + +