FELIX-1747 Use new Felix Parent POM 2-SNAPSHOT and move
legal file additions
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1067335 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index f076b0a..9cb2f77 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>2-SNAPSHOT</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -145,20 +145,6 @@
</dependencies>
<build>
<directory>${bundle.build.name}</directory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>DEPENDENCIES</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -338,6 +324,14 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <excludePackageNames>*.impl</excludePackageNames>
+ </configuration>
+ </plugin>
</plugins>
</build>