Import project in Eclipse 4.22

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/lttng-ust-java-tests-jul/.classpath b/lttng-ust-java-tests-jul/.classpath
index af1430be15836d78425a795565a49fcd23d562b4..2d5eac0c6758f383a3e2f4b62ee1d587396d0f5a 100644 (file)
--- a/lttng-ust-java-tests-jul/.classpath
+++ b/lttng-ust-java-tests-jul/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry combineaccessrules="false" exported="true" kind="src" path="/lttng-ust-java-tests-common"/>
        <classpathentry kind="src" output="target/classes" path="src/main/java">
                <attributes>
                        <attribute name="optional" value="true"/>
@@ -14,6 +15,7 @@
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
                <attributes>
+                       <attribute name="module" value="true"/>
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
@@ -22,5 +24,6 @@
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/lttng-ust-java-tests-log4j/.classpath b/lttng-ust-java-tests-log4j/.classpath
index af1430be15836d78425a795565a49fcd23d562b4..3d72c56f2fe1f2e58e558ebc10dd5d3021e3bb70 100644 (file)
--- a/lttng-ust-java-tests-log4j/.classpath
+++ b/lttng-ust-java-tests-log4j/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="src" path="/lttng-ust-java-tests-common"/>
        <classpathentry kind="src" output="target/classes" path="src/main/java">
                <attributes>
                        <attribute name="optional" value="true"/>
@@ -14,6 +15,7 @@
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
                <attributes>
+                       <attribute name="module" value="true"/>
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
@@ -22,5 +24,6 @@
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/pom.xml b/pom.xml
index 7107870d2ca15ece099c4b37329e53a3ac8af457..c5a354a7016a96ff208c42e1b03183d4e3e1f677 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>RELEASE</version>
+        <version>4.13.2</version>
         <scope>test</scope>
       </dependency>