FELIX-3921 - Migrate to the Felix parent 2.1
Move to the new legal file support
Add the copyright header to file without
Remove outdated doc
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1456003 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/api/pom.xml b/ipojo/runtime/api/pom.xml
index 0be176b..e54a585 100644
--- a/ipojo/runtime/api/pom.xml
+++ b/ipojo/runtime/api/pom.xml
@@ -21,8 +21,8 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
- <relativePath>../../pom/pom.xml</relativePath>
+ <version>2.1</version>
+ <relativePath>../../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -57,49 +57,14 @@
<Export-Package>
org.apache.felix.ipojo.api,
org.apache.felix.ipojo.api.composite,
- org.apache.felix.ipojo.manipulation,
- org.apache.felix.ipojo.manipulation.annotations,
- org.objectweb.asm.commons;version=3.3.1,
- org.objectweb.asm;version=3.3.1,
- org.objectweb.asm.signature;version=3.3.1
+ org.objectweb.asm.commons;version=3.3.1;-split-package:=merge-last,
+ org.objectweb.asm;version=3.3.1;-split-package:=merge-last,
+ org.objectweb.asm.signature;version=3.3.1;-split-package:=merge-last
</Export-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/DEPENDENCIES=DEPENDENCIES
- </Include-Resource>
-
</instructions>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
- <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
- <excludes>
- <param>doc/**/*</param>
- <param>maven-eclipse.xml</param>
- <param>.checkstyle</param>
- <param>.externalToolBuilders/*</param>
- <param>LICENSE.asm</param>
- <param>.fbprefs</param>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <enableRulesSummary>false</enableRulesSummary>
- <violationSeverity>warning</violationSeverity>
- <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -123,7 +88,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.8.6</version>
+ <version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>asm</groupId>