Skip to content

Commit cbd9afc

Browse files
committed
[MAINTENANCE] Fix jmx-whiteboard tests
1 parent 73b0e3e commit cbd9afc

File tree

1 file changed

+28
-41
lines changed

1 file changed

+28
-41
lines changed

jmx/jmx-whiteboard/pom.xml

+28-41
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<parent>
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
27-
<version>2.0.1</version>
27+
<version>2.1.1</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
29-
</parent>
29+
</parent>
3030

3131
<groupId>org.apache.aries.jmx</groupId>
3232
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
@@ -46,18 +46,18 @@
4646
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
4747
</scm>
4848

49-
<!-- A Note on Testing ================= This project contains two kinds
50-
of tests: regular unit tests running in the test phase and integration tests
51-
based on PAX Exam running in the integration-test phase. Basically the complete
52-
project is build using Java 1.3 source and target compatibility (as inherited
53-
from the parent pom). The exception are the unit tests in the "integration"
54-
packages. These have to be compiled with Java 5 source and target compatibility
55-
because the employ annotations and generics. For running the integration
56-
tests from the console using Maven nothing special has to be done as the
57-
tests run automatically. To run the tests in your IDE, the project has to
58-
be built to the "package" phase with the profile "ide" enabled: $ mvn -Pide
59-
clean package This creates the scr.jar file in the target folder, which is
60-
used by the integration tests when run from the IDE. Alternatively the "project.bundle.file"
49+
<!-- A Note on Testing ================= This project contains two kinds
50+
of tests: regular unit tests running in the test phase and integration tests
51+
based on PAX Exam running in the integration-test phase. Basically the complete
52+
project is build using Java 1.3 source and target compatibility (as inherited
53+
from the parent pom). The exception are the unit tests in the "integration"
54+
packages. These have to be compiled with Java 5 source and target compatibility
55+
because the employ annotations and generics. For running the integration
56+
tests from the console using Maven nothing special has to be done as the
57+
tests run automatically. To run the tests in your IDE, the project has to
58+
be built to the "package" phase with the profile "ide" enabled: $ mvn -Pide
59+
clean package This creates the scr.jar file in the target folder, which is
60+
used by the integration tests when run from the IDE. Alternatively the "project.bundle.file"
6161
system property may be set to the bundle JAR in the IDE launcher. -->
6262
<properties>
6363
<bundle.build.name>
@@ -81,13 +81,15 @@
8181
</aries.osgi.import.service>
8282

8383
<exam.version>3.4.0</exam.version>
84-
<url.version>1.6.0</url.version>
84+
<javax.inject.version>1</javax.inject.version>
85+
<org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
86+
<url.version>2.5.3</url.version>
8587
</properties>
8688

8789
<build>
8890
<plugins>
89-
<!-- Exclude Integration tests in (default) unit tests and conversely
90-
enable integration tests for integration testing only. Helper classes are
91+
<!-- Exclude Integration tests in (default) unit tests and conversely
92+
enable integration tests for integration testing only. Helper classes are
9193
completely excluded from testing. -->
9294
<plugin>
9395
<artifactId>maven-surefire-plugin</artifactId>
@@ -129,7 +131,7 @@
129131
<artifactId>slf4j-api</artifactId>
130132
<scope>provided</scope>
131133
</dependency>
132-
134+
133135
<dependency>
134136
<groupId>org.apache.aries.jmx</groupId>
135137
<artifactId>org.apache.aries.jmx.core</artifactId>
@@ -199,9 +201,15 @@
199201
<scope>test</scope>
200202
</dependency>
201203
<dependency>
202-
<groupId>org.eclipse</groupId>
204+
<groupId>org.eclipse.platform</groupId>
203205
<artifactId>org.eclipse.osgi</artifactId>
204-
<version>3.8.0.v20120529-1548</version>
206+
<version>${org.eclipse.osgi.version}</version>
207+
<scope>test</scope>
208+
</dependency>
209+
<dependency>
210+
<groupId>javax.inject</groupId>
211+
<artifactId>javax.inject</artifactId>
212+
<version>${javax.inject.version}</version>
205213
</dependency>
206214
</dependencies>
207215

@@ -247,25 +255,4 @@
247255
</build>
248256
</profile>
249257
</profiles>
250-
251-
<!-- repositories for Pax Exam and BND tool -->
252-
<repositories>
253-
<repository>
254-
<id>ops4j</id>
255-
<name>ops4j</name>
256-
<url>http://repository.ops4j.org/maven2</url>
257-
<snapshots>
258-
<enabled>false</enabled>
259-
</snapshots>
260-
</repository>
261-
<repository>
262-
<id>aqute</id>
263-
<name>aqute</name>
264-
<url>http://www.aqute.biz/repo</url>
265-
<snapshots>
266-
<enabled>false</enabled>
267-
</snapshots>
268-
</repository>
269-
</repositories>
270-
271258
</project>

0 commit comments

Comments
 (0)