Modify dependencies files
Update changelog
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@990520 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/annotations/DEPENDENCIES b/ipojo/annotations/DEPENDENCIES
index c20d6f7..ac6fd9e 100644
--- a/ipojo/annotations/DEPENDENCIES
+++ b/ipojo/annotations/DEPENDENCIES
@@ -1,13 +1,13 @@
Apache Felix iPOJO Annotations
Copyright 2008-2010 The Apache Software Foundation
-I. Included Software
+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.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
-II. Used Software
+II. Used Third-Party Software
III. License Summary
- Apache License 2.0
diff --git a/ipojo/annotations/pom.xml b/ipojo/annotations/pom.xml
index ad1b0f5..bbe3d18 100644
--- a/ipojo/annotations/pom.xml
+++ b/ipojo/annotations/pom.xml
@@ -29,15 +29,15 @@
<version>1.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Annotations</name>
-
+
<description>
iPOJO Annotation pack. contained annotations are used to define iPOJO component type.
</description>
<url>
http://felix.apache.org/site/how-to-use-ipojo-annotations.html
</url>
-
-
+
+
<build>
<plugins>
<plugin>
@@ -68,7 +68,7 @@
org.apache.felix.ipojo.handlers.event,
org.apache.felix.ipojo.transaction
</Export-Package>
- <Include-Resource>
+ <Include-Resource>
META-INF/LICENSE=LICENSE,
META-INF/NOTICE=NOTICE,
META-INF/DEPENDENCIES=DEPENDENCIES
@@ -90,6 +90,7 @@
<param>.checkstyle</param>
<param>.externalToolBuilders/*</param>
<param>LICENSE.asm</param>
+ <param>DEPENDENCIES</param>
</excludes>
</configuration>
</plugin>
@@ -101,5 +102,21 @@
</configuration>
</plugin>
</plugins>
+
+ <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>
+
</build>
</project>