Skip to content

Commit

Permalink
Fix alibaba#66
Browse files Browse the repository at this point in the history
  • Loading branch information
@nkorange
nkorange committed Sep 21, 2018
2 parents 4b5bdec + 357702a commit ba84fda
Show file tree
Hide file tree
Showing 18 changed files with 46 additions and 25 deletions.
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
15 changes: 14 additions & 1 deletion config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -128,6 +128,19 @@
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
<excludes>
<exclude>application.properties</exclude>
<exclude>banner.txt</exclude>
<exclude>nacos-config-logback.xml</exclude>
<exclude>schema.sql</exclude>
<exclude>nacos-db.sql</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>
<profile>
Expand Down
14 changes: 13 additions & 1 deletion console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>
<artifactId>nacos-console</artifactId>
<!--<packaging>war</packaging>-->
Expand Down Expand Up @@ -67,5 +67,17 @@
</executions>
</plugin>
</plugins>
<resources>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
<excludes>
<exclude>application.properties</exclude>
<exclude>banner.txt</exclude>
<exclude>diamond-server-logback.xml</exclude>
<exclude>schema.sql</exclude>
</excludes>
</resource>
</resources>
</build>
</project>
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
1 change: 1 addition & 0 deletions distribution/bin/startup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=
JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:-UseParNewGC"
JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:${BASE_DIR}/logs/nacos_gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintAdaptiveSizePolicy"
JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}"
JAVA_OPT="${JAVA_OPT} -Dspring.config.location=${BASE_DIR}/conf/application.properties"
if [[ "${MODE}" == "standalone" ]]; then
JAVA_OPT="${JAVA_OPT} -Dnacos.standalone=true"
fi
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion naming/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions naming/src/test/java/com/alibaba/nacos/naming/controllers/InstanceControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void registerInstance() throws Exception {
IpAddress ipAddress = new IpAddress();
ipAddress.setIp("1.1.1.1");
ipAddress.setPort(9999);
List<IpAddress> ipList = new ArrayList<>();
List<IpAddress> ipList = new ArrayList<IpAddress>();
ipList.add(ipAddress);
domain.updateIPs(ipList, false);

Expand Down Expand Up @@ -127,7 +127,7 @@ public void getInstances() throws Exception {
ipAddress.setIp("10.10.10.10");
ipAddress.setPort(8888);
ipAddress.setWeight(2.0);
List<IpAddress> ipList = new ArrayList<>();
List<IpAddress> ipList = new ArrayList<IpAddress>();
ipList.add(ipAddress);
domain.updateIPs(ipList, false);

Expand Down
2 changes: 1 addition & 1 deletion naming/src/test/java/com/alibaba/nacos/naming/core/ClusterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void updateIps() {
ipAddress2.setIp("1.1.1.1");
ipAddress2.setPort(2345);

List<IpAddress> list = new ArrayList<>();
List<IpAddress> list = new ArrayList<IpAddress>();
list.add(ipAddress1);
list.add(ipAddress2);

Expand Down
2 changes: 1 addition & 1 deletion naming/src/test/java/com/alibaba/nacos/naming/core/DomainTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void updateIps() throws Exception {
IpAddress ipAddress = new IpAddress();
ipAddress.setIp("1.1.1.1");
ipAddress.setPort(1234);
List<IpAddress> list = new ArrayList<>();
List<IpAddress> list = new ArrayList<IpAddress>();
list.add(ipAddress);

domain.onChange("iplist", JSON.toJSONString(list));
Expand Down
2 changes: 1 addition & 1 deletion naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void easyRemvIP4Dom() throws Exception {

IpAddress ipAddress = new IpAddress();
ipAddress.setIp("1.1.1.1");
List<IpAddress> ipList = new ArrayList<>();
List<IpAddress> ipList = new ArrayList<IpAddress>();
ipList.add(ipAddress);
domainsManager.addLock("nacos.test.1");
domainsManager.easyRemvIP4Dom("nacos.test.1", ipList);
Expand Down
2 changes: 1 addition & 1 deletion naming/src/test/java/com/alibaba/nacos/naming/web/APICommandsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void ip4Dom() throws Exception {
IpAddress ipAddress = new IpAddress();
ipAddress.setIp("1.1.1.1");
ipAddress.setPort(1234);
List<IpAddress> list = new ArrayList<>();
List<IpAddress> list = new ArrayList<IpAddress>();
list.add(ipAddress);

domain.onChange("iplist", JSON.toJSONString(list));
Expand Down
11 changes: 3 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,15 @@
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>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-parent</artifactId>-->
<!--<version>2.0.1.RELEASE</version>-->
<!--</parent>-->

<modelVersion>4.0.0</modelVersion>
<inceptionYear>2018</inceptionYear>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
<packaging>pom</packaging>

<name>Alibaba NACOS ${project.version}</name>
<description>Top Nacos project pom.xml file</description>
<url>http://nacos.io</url>
<prerequisites>
<maven>3.2.5</maven>
Expand All @@ -26,7 +21,7 @@
<url>[email protected]:alibaba/nacos.git</url>
<connection>scm:[email protected]:alibaba/nacos.git</connection>
<developerConnection>scm:[email protected]:alibaba/nacos.git</developerConnection>
<tag>nacos-all-0.2.1-SNAPSHOT</tag>
<tag>nacos-all-0.2.1-RC1</tag>
</scm>

<mailingLists>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.1-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ private <T> ResponseEntity<T> request(String path, MultiValueMap<String, String>

HttpHeaders headers = new HttpHeaders();

HttpEntity<?> entity = new HttpEntity(headers);
HttpEntity<?> entity = new HttpEntity<T>(headers);

UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(this.base.toString() + path)
.queryParams(params);
Expand Down

0 comments on commit ba84fda

Please sign in to comment.