X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=pom.xml;h=786ed97e7e3f08907759a3159e083377abf1931d;hb=4821eac962d2f707558b6d9a5b66af9dbe89b933;hp=2c098284eedc76022ae9b592eed15fe59d32de15;hpb=1df8e5d7716e0f095b434e2190f4054edb837f42;p=lttng-ust-java-tests.git

diff --git a/pom.xml b/pom.xml
index 2c09828..786ed97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,13 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    
+    <!-- Paths that come from UST's default "make install".
+         Override to specify other locations. -->
+    <common-jar-location>/usr/local/share/java/lttng-ust-agent-common-1.0.0.jar</common-jar-location>
+    <jul-jar-location>/usr/local/share/java/lttng-ust-agent-jul-1.0.0.jar</jul-jar-location>
+    <log4j-jar-location>/usr/local/share/java/lttng-ust-agent-log4j-1.0.0.jar</log4j-jar-location>
+    <argLine>-Djava.library.path=/usr/local/lib</argLine>
   </properties>
 
   <build>
@@ -49,13 +56,85 @@
           <target>1.8</target>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.18.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
-  
-  
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- System dependencies, should have been installed by UST -->
+      <dependency>
+        <groupId>org.lttng.ust.agent</groupId>
+        <artifactId>lttng-ust-agent-common</artifactId>
+        <version>1.0.0</version>
+        <scope>system</scope>
+        <systemPath>${common-jar-location}</systemPath>
+      </dependency>
+
+      <dependency>
+        <groupId>org.lttng.ust.agent</groupId>
+        <artifactId>lttng-ust-agent-jul</artifactId>
+        <version>1.0.0</version>
+        <scope>system</scope>
+        <systemPath>${jul-jar-location}</systemPath>
+      </dependency>
+
+      <dependency>
+        <groupId>org.lttng.ust.agent</groupId>
+        <artifactId>lttng-ust-agent-log4j</artifactId>
+        <version>1.0.0</version>
+        <scope>system</scope>
+        <systemPath>${log4j-jar-location}</systemPath>
+      </dependency>
+
+      <!-- Provided by this project -->
+      <dependency>
+        <groupId>org.lttng.tools</groupId>
+        <artifactId>lttng-tools-java</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.lttng.ust</groupId>
+        <artifactId>lttng-ust-java-tests-common</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+
+      <!-- Regular Maven dependencies -->
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>RELEASE</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+
   <modules>
-    <module>lttng-ust-java-tests</module>
     <module>lttng-tools-java</module>
+    <module>lttng-ust-java-tests-common</module>
+    <module>lttng-ust-java-tests-jul</module>
+    <module>lttng-ust-java-tests-log4j</module>
   </modules>
 
 </project>