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/manipulator/ipojo-ant-task/pom.xml b/ipojo/manipulator/ipojo-ant-task/pom.xml
index 77dc9c2..e2239c5 100644
--- a/ipojo/manipulator/ipojo-ant-task/pom.xml
+++ b/ipojo/manipulator/ipojo-ant-task/pom.xml
@@ -20,12 +20,11 @@
<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>
<artifactId>org.apache.felix.ipojo.ant</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.9.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Ant Task</name>
@@ -60,25 +59,11 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>DEPENDENCIES*</include>
- </includes>
- </resource>
- </resources>
<plugins>
<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>
@@ -99,12 +84,6 @@
org.apache.xerces.dom.*, org.apache.xerces.dom3.*
</Private-Package>
<Export-Package>org.apache.felix.ipojo.task</Export-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/DEPENDENCIES=DEPENDENCIES
- </Include-Resource>
<Import-Package>!org.objectweb.asm.signature, !org.objectweb.asm.tree,
!org.objectweb.asm.tree.analysis, *
</Import-Package>
@@ -113,22 +92,6 @@
</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>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
@@ -147,26 +110,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>