|
24 | 24 | <parent>
|
25 | 25 | <groupId>org.apache.aries</groupId>
|
26 | 26 | <artifactId>parent</artifactId>
|
27 |
| - <version>2.0.1</version> |
| 27 | + <version>2.1.1</version> |
28 | 28 | <relativePath>../../parent/pom.xml</relativePath>
|
29 |
| - </parent> |
| 29 | + </parent> |
30 | 30 |
|
31 | 31 | <groupId>org.apache.aries.jmx</groupId>
|
32 | 32 | <artifactId>org.apache.aries.jmx.whiteboard</artifactId>
|
|
46 | 46 | <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
|
47 | 47 | </scm>
|
48 | 48 |
|
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" |
61 | 61 | system property may be set to the bundle JAR in the IDE launcher. -->
|
62 | 62 | <properties>
|
63 | 63 | <bundle.build.name>
|
|
81 | 81 | </aries.osgi.import.service>
|
82 | 82 |
|
83 | 83 | <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> |
85 | 87 | </properties>
|
86 | 88 |
|
87 | 89 | <build>
|
88 | 90 | <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 |
91 | 93 | completely excluded from testing. -->
|
92 | 94 | <plugin>
|
93 | 95 | <artifactId>maven-surefire-plugin</artifactId>
|
|
129 | 131 | <artifactId>slf4j-api</artifactId>
|
130 | 132 | <scope>provided</scope>
|
131 | 133 | </dependency>
|
132 |
| - |
| 134 | + |
133 | 135 | <dependency>
|
134 | 136 | <groupId>org.apache.aries.jmx</groupId>
|
135 | 137 | <artifactId>org.apache.aries.jmx.core</artifactId>
|
|
199 | 201 | <scope>test</scope>
|
200 | 202 | </dependency>
|
201 | 203 | <dependency>
|
202 |
| - <groupId>org.eclipse</groupId> |
| 204 | + <groupId>org.eclipse.platform</groupId> |
203 | 205 | <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> |
205 | 213 | </dependency>
|
206 | 214 | </dependencies>
|
207 | 215 |
|
|
247 | 255 | </build>
|
248 | 256 | </profile>
|
249 | 257 | </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 |
| - |
271 | 258 | </project>
|
0 commit comments