Author: jawi
Date: Tue Dec 4 12:05:25 2012
New Revision: 1416905
URL: http://svn.apache.org/viewvc?rev=1416905&view=rev
Log:
FELIX-3804: fix the failing build due to upgrade to new Felix parent POM.
Modified:
felix/trunk/useradmin/itest/pom.xml
Modified: felix/trunk/useradmin/itest/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/useradmin/itest/pom.xml?rev=1416905&r1=1416904&r2=1416905&view=diff
==============================================================================
--- felix/trunk/useradmin/itest/pom.xml (original)
+++ felix/trunk/useradmin/itest/pom.xml Tue Dec 4 12:05:25 2012
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -20,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>felix-parent</artifactId>
<groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
<version>2.1</version>
<relativePath>../../../pom/pom.xml</relativePath>
</parent>
@@ -34,7 +35,7 @@
<pax.runner.version>1.7.6</pax.runner.version>
</properties>
<artifactId>org.apache.felix.useradmin.itest</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<description>Integration tests for the UserAdmin OSGi compendium
service.</description>
<dependencies>
@@ -50,19 +51,19 @@
<version>${osgi.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.useradmin</artifactId>
<version>1.0.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.useradmin.filestore</artifactId>
<version>1.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
<version>3.0.0</version>
<scope>test</scope>
@@ -145,16 +146,21 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <includes>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>src/main/resources/**</exclude>
- </excludes>
- </configuration>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>maven-paxexam-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-config</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
