diff --git a/.travis.yml b/.travis.yml index 0a72cbabd..dbb5bb01e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ install: - mvn install:install-file -Dfile=jmxtools-1.2.1.jar -DgroupId=com.sun.jdmk -DartifactId=jmxtools -Dversion=1.2.1 -Dpackaging=jar - mvn install:install-file -Dfile=jmxri-1.2.1.jar -DgroupId=com.sun.jmx -DartifactId=jmxri -Dversion=1.2.1 -Dpackaging=jar - mvn install:install-file -Dfile=dubbox-2.8.4.jar -DgroupId=com.alibaba -DartifactId=dubbox -Dversion=2.8.4 -Dpackaging=jar + - mvn install:install-file -Dfile=ojdbc14-10.2.0.4.0.jar -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.4.0 -Dpackaging=jar - cd .. script: diff --git a/ci-dependencies/ojdbc14-10.2.0.4.0.jar b/ci-dependencies/ojdbc14-10.2.0.4.0.jar new file mode 100644 index 000000000..f41cf1ae9 Binary files /dev/null and b/ci-dependencies/ojdbc14-10.2.0.4.0.jar differ diff --git a/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java b/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java index 97e6588a2..f0256f4b8 100644 --- a/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java +++ b/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java @@ -144,7 +144,7 @@ public class AlarmMessageProcessor { + (exceptionAlarmSize > 0 ? exceptionAlarmSize + " tid of system exceptions, " : ""); if (count > exceptionAlarmSize) { - title += (count - exceptionAlarmSize) + " tid of warings, "; + title += (count - exceptionAlarmSize) + " tid of warnings, "; } title += "between " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date( diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java index 14efcb7a8..83de09e4b 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java @@ -4,7 +4,7 @@ public class Constants { /** * 务必严格保持两位的version */ - public static String SDK_VERSION = "1.0-Final"; + public static String SDK_VERSION = "1.0Final"; public static final String HEALTH_DATA_SPILT_PATTERN = "^~";