From 4450f4ecfcdb0a295ee51b1adf0f12a840b5aa74 Mon Sep 17 00:00:00 2001
From: HyunGil Jeong <hyungil.jeong@navercorp.com>
Date: Mon, 13 Apr 2015 15:23:37 +0900
Subject: [PATCH 1/2] added check for required env variables

---
 pom.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3f6a29e34..9c5d0baab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,6 +726,31 @@
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <version>2.5.5</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <id>enforce-pinpoint-build-requirements</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireEnvironmentVariable>
+                                    <variableName>JAVA_6_HOME</variableName>
+                                </requireEnvironmentVariable>
+                                <requireEnvironmentVariable>
+                                    <variableName>JAVA_7_HOME</variableName>
+                                </requireEnvironmentVariable>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

From cfc1befc7d350abee2625c5ce0abaa0ea14d2513 Mon Sep 17 00:00:00 2001
From: Jongho Moon <jongho.moon@navercorp.com>
Date: Mon, 13 Apr 2015 15:45:59 +0900
Subject: [PATCH 2/2] Fixed test failure

---
 .../pinpoint/profiler/plugin/DefaultInterceptorFactoryTest.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/DefaultInterceptorFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/DefaultInterceptorFactoryTest.java
index 57494720c..f9e2f1f1a 100644
--- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/DefaultInterceptorFactoryTest.java
+++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/DefaultInterceptorFactoryTest.java
@@ -49,6 +49,7 @@ public class DefaultInterceptorFactoryTest {
     @Before
     public void setUp() {
         reset(instrumentor, traceContext, aClass, aMethod);
+        when(pluginContext.getTraceContext()).thenReturn(traceContext);
         when(aMethod.getDescriptor()).thenReturn(descriptor);
     }