X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=2c098284eedc76022ae9b592eed15fe59d32de15;hb=1aea34880f2331c5c3431e7d1520bb99b965736b;hp=54da5fac893dcc20df60da383f8ddd1c61e635e4;hpb=24b260d9fe97bdd0b9538d3cf197e9e3278c7e85;p=lttng-ust-java-tests.git

diff --git a/pom.xml b/pom.xml
index 54da5fa..2c09828 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,67 +22,28 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.lttng.ust.agent</groupId>
-  <artifactId>lttng-ust-agent-tests</artifactId>
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
+
+  <groupId>org.lttng.ust</groupId>
+  <artifactId>lttng-ust-java-parent</artifactId>
   <version>1.0.0</version>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
 
-  <name>LTTng-UST Java Agent Test Suite</name>
+  <name>LTTng-UST Java Agent</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- 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>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
-  
-  <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>
-
-    <!-- "Real" Maven dependencies -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>3.3</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -90,5 +51,11 @@
       </plugin>
     </plugins>
   </build>
+  
+  
+  <modules>
+    <module>lttng-ust-java-tests</module>
+    <module>lttng-tools-java</module>
+  </modules>
 
 </project>