Update to latest parent pom 2.1
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1174098 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/DEPENDENCIES b/main/DEPENDENCIES
deleted file mode 100644
index 2e9b873..0000000
--- a/main/DEPENDENCIES
+++ /dev/null
@@ -1,27 +0,0 @@
-Apache Felix Main
-Copyright 2011 The Apache Software Foundation
-
-This software was developed at the Apache Software Foundation
-(http://www.apache.org) and may have dependencies on other
-Apache software licensed under Apache License 2.0.
-
-I. Included Third-Party Software
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
-
-II. Used Third-Party Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Codehaus (http://www.codehaus.org)
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/main/NOTICE b/main/NOTICE
deleted file mode 100644
index 21c5be7..0000000
--- a/main/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Felix Main
-Copyright 2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
diff --git a/main/pom.xml b/main/pom.xml
index 02af91c..1529237 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -20,7 +20,7 @@
<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>
@@ -72,26 +72,10 @@
<Private-Package>org.apache.felix.main.*</Private-Package>
<Export-Package>!org.osgi.service.log, !org.osgi.service.obr,org.osgi.*</Export-Package>
<Import-Package>!*</Import-Package>
- <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}</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>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -167,15 +151,6 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>DEPENDENCIES*</include>
- </includes>
- </resource>
</resources>
</build>
</project>
diff --git a/main/src/main/appended-resources/META-INF/DEPENDENCIES b/main/src/main/appended-resources/META-INF/DEPENDENCIES
new file mode 100644
index 0000000..cce7c0b
--- /dev/null
+++ b/main/src/main/appended-resources/META-INF/DEPENDENCIES
@@ -0,0 +1,16 @@
+I. Included Third-Party Software
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/main/LICENSE b/main/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from main/LICENSE
rename to main/src/main/appended-resources/META-INF/LICENSE
diff --git a/main/src/main/appended-resources/META-INF/NOTICE b/main/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..3db2e43
--- /dev/null
+++ b/main/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,4 @@
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.