Merge remote-tracking branch 'origin/dev-1.0' into dev-1.0

pom.xml

@@ -42,10 +42,23 @@
             <version>${log.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <version>6.1.5</version>
+        </dependency>
     </dependencies>
 
     <build>
-
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>3.3.0.603</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -55,6 +68,24 @@
                     <target>8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <version>6.1.5</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration><!-- Generate all report formats -->
+                    <format>ALL</format><!-- Don't use Nexus Analyzer -->
+                    <centralAnalyzerEnabled>false</centralAnalyzerEnabled>
+                    <versionCheckEnabled>true</versionCheckEnabled>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+
 </project>

sonar.cmd

@@ -0,0 +1,9 @@
+call mvn clean compile dependency-check:check
+call mvn sonar:sonar ^
+  -Dsonar.projectKey=sydapi-sge-datebase ^
+  -Dsonar.host.url=http://172.16.17.236:9000 ^
+  -Dsonar.login=3f3a85127ef9636cf37a39d8fbfe823b7e952481 ^
+  -Dsonar.pdf.username=admin -Dsonar.pdf.password=admin ^
+  -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json ^
+  -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml ^
+  -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html

src/test/java/test/LengthTest.java

@@ -21,7 +21,7 @@ public class LengthTest
     @Before
     public void init(){
         SydApiBuilder builder = new SydApiBuilder(
-                new String[]{ "192.168.0.200" },
+                new String[]{ "192.168.1.128" },
                 new int[]{ 8889 },
                 10,
                 15

src/test/java/test/Test.java

@@ -1,4 +1,4 @@
-//package test;
+package test;
 //
 //import com.sunyard.sge.database.*;
 //import org.junit.Test;
@@ -90,3 +90,15 @@
 ////        }
 //    }
 //}
+
+
+public class Test {
+    public static void main(String[] args) {
+        if (16 > 1799 + 16
+                ||
+                (1799 + 16)/16<2
+        ) {
+            System.out.println("1");
+        }
+    }
+}