mirror of
https://github.com/wahyd4/pinpoint.git
synced 2026-08-18 01:06:03 +10:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
+1
-1
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-bootstrap</artifactId>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-collector</artifactId>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-commons</artifactId>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
</organization>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
<name>pinpoint</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-profiler-optional</artifactId>
|
||||
@@ -78,7 +78,7 @@
|
||||
<fork>true</fork>
|
||||
<verbose>true</verbose>
|
||||
<compilerVersion>${jdk.version}</compilerVersion>
|
||||
<executable>${JAVA_7_HOME}/bin/javac</executable>
|
||||
<executable>${env.JAVA_7_HOME}/bin/javac</executable>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
@@ -108,7 +108,7 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<jvm>${JAVA_7_HOME}/bin/java</jvm>
|
||||
<jvm>${env.JAVA_7_HOME}/bin/java</jvm>
|
||||
<forkMode>once</forkMode>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-profiler</artifactId>
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-rpc</artifactId>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-testweb</artifactId>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-thrift</artifactId>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.nhn.pinpoint</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>${pinpoint-version}</version>
|
||||
<version>1.0.3-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>pinpoint-web</artifactId>
|
||||
|
||||
Reference in New Issue
Block a user