X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=pom.xml;h=7dd56aa3e0bcce1adc6bce8a049ad4efcdcd1cd3;hb=HEAD;hp=fe19978cc4bed24d29ced5d490279fa16ce564cf;hpb=d4e2e87c9bb9dfe32fa15aea16fc24b86a0fe661;p=lttng-ust-java-tests.git

diff --git a/pom.xml b/pom.xml
index fe19978..7dd56aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,19 +2,19 @@
 <!--
    Copyright (C) 2015, EfficiOS Inc., Alexandre Montplaisir <alexmonthy@efficios.com>
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; only
+   version 2.1 of the License.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -26,93 +26,166 @@
     <maven>3.0</maven>
   </prerequisites>
 
-  <groupId>org.lttng.ust.agent</groupId>
-  <artifactId>lttng-ust-agent-tests</artifactId>
-  <version>1.0.0</version>
-  <packaging>jar</packaging>
+  <groupId>org.lttng.ust</groupId>
+  <artifactId>lttng-ust-java-parent</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <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>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    <!-- Work around bug SUREFIRE-1831 in failsafe 3.0.0-M5 -->
+    <failsafe.useModulePath>false</failsafe.useModulePath>
+
     <!-- 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>
+    <log4j2-jar-location>/usr/local/share/java/lttng-ust-agent-log4j2-1.0.0.jar</log4j2-jar-location>
     <argLine>-Djava.library.path=/usr/local/lib</argLine>
   </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.3</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
       </plugin>
     </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.9.0</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
+        </plugin>
+
+	<!-- Set Surefire to the same version as Failsafe even if we don't use
+	     it. Otherwise, Maven will invoke a random default version and if
+	     we specify a user property used by both plugins on the command
+	     line things could go wrong. -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.0.0-M5</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>3.0.0-M5</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>integration-test</goal>
+                <goal>verify</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
   </build>
 
-  <profiles>
-    <profile>
-      <id>benchmark</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.18.1</version>
-            <configuration>
-              <includes>
-                <include>**/*Benchmark.java</include>
-              </includes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <dependencyManagement>
+    <dependencies>
+      <!-- Regular Maven dependencies -->
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-api</artifactId>
+        <version>2.22.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+        <version>2.22.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+      <!-- 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>
+
+      <dependency>
+        <groupId>org.lttng.ust.agent</groupId>
+        <artifactId>lttng-ust-agent-log4j2</artifactId>
+        <version>1.0.0</version>
+        <scope>system</scope>
+        <systemPath>${log4j2-jar-location}</systemPath>
+      </dependency>
+
+      <!-- Provided by this project -->
+      <dependency>
+        <groupId>org.lttng.tools</groupId>
+        <artifactId>lttng-tools-java</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.lttng.ust</groupId>
+        <artifactId>lttng-ust-java-tests-common</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+
+  <modules>
+    <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>
+    <module>lttng-ust-java-tests-log4j2</module>
+  </modules>
 
 </project>