X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=pom.xml;h=68c634aa01d7324cf69620962a200522f10b9ac0;hb=7a4f0255e3d52ad76b194fb2e83bcdc6f641549e;hp=a1059f64949611178a543f22b2ad742def8b55b9;hpb=7bf69f796bbb9921a51a94afb15cca69b5f99baa;p=lttng-ust-java-tests.git

diff --git a/pom.xml b/pom.xml
index a1059f6..68c634a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@
    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
@@ -28,7 +28,7 @@
 
   <groupId>org.lttng.ust</groupId>
   <artifactId>lttng-ust-java-parent</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>LTTng-UST Java Agent</name>
@@ -36,12 +36,16 @@
   <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>
 
@@ -63,7 +67,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.6.1</version>
+          <version>3.9.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -73,7 +77,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.19.1</version>
+          <version>3.0.0-M5</version>
           <executions>
             <execution>
               <goals>
@@ -88,16 +92,35 @@
 
   </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>19.0</version>
-    </dependency>
-  </dependencies>
-
   <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.17.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+        <version>2.17.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>
@@ -123,30 +146,25 @@
         <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.0.0</version>
+        <version>1.1.0-SNAPSHOT</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>
+        <version>1.1.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
@@ -158,6 +176,7 @@
     <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>