update shell

.gitignore

@@ -9,3 +9,4 @@ target
 /logs
 *.iml
 node_modules
+test/derby.log

config/pom.xml

@@ -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>

console/pom.xml

@@ -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>

distribution/bin/startup.sh

@@ -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

naming/src/test/java/com/alibaba/nacos/naming/controllers/InstanceControllerTest.java

@@ -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);
 
@@ -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);
 

naming/src/test/java/com/alibaba/nacos/naming/core/ClusterTest.java

@@ -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);
 

naming/src/test/java/com/alibaba/nacos/naming/core/DomainTest.java

@@ -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));

naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java

@@ -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);

naming/src/test/java/com/alibaba/nacos/naming/web/APICommandsTest.java

@@ -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));

test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java

@@ -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);