Merge pull request #3 from scouter-project/dev

Dev
scouter-contrib · Sep 7, 2016 · d000dcd · d000dcd
2 parents 40c3d6e + a36dc24
commit d000dcd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/pulse.lib.http/pom.xml b/pulse.lib.http/pom.xml
@@ -10,8 +10,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -30,11 +28,6 @@
             <artifactId>gson</artifactId>
             <version>2.6.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>2.7.5</version>
-        </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>

diff --git a/pulse.sample.bizcounter/java-sample/pom.xml b/pulse.sample.bizcounter/java-sample/pom.xml
@@ -12,8 +12,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -46,6 +44,27 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
+                <configuration>
+                    <transformers>
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>scouterx.pulse.sample.bizcounter.App</mainClass>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

diff --git a/...counter/java-sample/src/main/java/scouterx/pulse/sample/bizcounter/BizDataController.java b/...counter/java-sample/src/main/java/scouterx/pulse/sample/bizcounter/BizDataController.java
@@ -118,7 +118,7 @@ private float getRandomSample2(String type) {
             prev.put(type, value);
         }
 
-        value = value + (float) Math.random() * value / 20;
+        value = value + (float) Math.random() * 30;
         prev2.put(type, value);
 
         return value;