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/handler/temporal/temporal-dependency-handler/pom.xml b/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
index 30d1da8..21dee30 100644
--- a/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
+++ b/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
@@ -21,13 +21,12 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
+ <version>2.1</version>
<relativePath>../../../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<artifactId>org.apache.felix.ipojo.handler.temporal</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.7.0-SNAPSHOT</version>
<name>Apache Felix iPOJO Temporal Service Dependency Handler</name>
@@ -64,13 +63,13 @@
<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>
<Private-Package>
- org.apache.felix.ipojo.handler.temporal,
- org.objectweb.asm
+ org.apache.felix.ipojo.handler.temporal;-split-package:=merge-first,
+ org.objectweb.asm;-split-package:=merge-last
</Private-Package>
<Bundle-Name>${project.name}</Bundle-Name>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
@@ -84,12 +83,6 @@
<Bundle-DocURL>
http://felix.apache.org/site/temporal-service-dependency.html
</Bundle-DocURL>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/NOTICE=NOTICE,
- META-INF/DEPENDENCIES=DEPENDENCIES
- </Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -109,22 +102,6 @@
</executions>
</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>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>