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/manipulator/DEPENDENCIES b/ipojo/manipulator/DEPENDENCIES
index 3a843d3..ee7a58d 100644
--- a/ipojo/manipulator/DEPENDENCIES
+++ b/ipojo/manipulator/DEPENDENCIES
@@ -1,17 +1,17 @@
Apache Felix iPOJO Manipulator
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
This product includes software developed at
Copyright (c) 2000-2005 INRIA, France Telecom
Licensed under BSD License.
-II. Used Software
+II. Used Third-Party Software
This product uses software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/ipojo/manipulator/doc/changelog.txt b/ipojo/manipulator/doc/changelog.txt
index 5f50586..1a1a37f 100644
--- a/ipojo/manipulator/doc/changelog.txt
+++ b/ipojo/manipulator/doc/changelog.txt
@@ -6,12 +6,14 @@
** Improvement
* [FELIX-2420] - Enum support for @Property annotation
* [FELIX-2461] - Allow specifying the targeted service interface in the @ServiceController
-
+ * [FELIX-2485] - Improve the performance of the manipulator on large files
+ * [FELIX-2542] - Annotations on methods parameters are not moved on public methods after manipulation
+
Changes from the 1.6.0 to 1.6.2
-------------------------------
** Improvement
* [FELIX-2296] - Access to ServiceReference in iPOJO service.
-
+
Changes from the 1.4.2 to 1.6.0
-------------------------------
** Improvement
@@ -21,15 +23,15 @@
** Wish
* [FELIX-1940] - Add @Instance annotation to declare instances without metadata.xml
-
-
+
+
Changes from the 1.4.0 to 1.4.2
-------------------------------
** Bug
* [FELIX-1411] - Issue on windows to find components inside bundle
* [FELIX-1518] - iPOJO manipulator is really slow even when annotation are ignored
-
-
+
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug
@@ -39,8 +41,8 @@
** Improvement
* Update parent pom
* [FELIX-943] - Allow iPOJO manipulator to manipulate directories
-
-
+
+
Changes from 1.0.0 to 1.2.0
---------------------------
** Bug
@@ -67,7 +69,7 @@
* [FELIX-687] - Support inner and nested classes
* [FELIX-716] - Provide XML schemas for iPOJO descriptors
-
+
Version 0.8.0
-------------
* Initial release
diff --git a/ipojo/manipulator/pom.xml b/ipojo/manipulator/pom.xml
index 83473d5..5b0e68b 100644
--- a/ipojo/manipulator/pom.xml
+++ b/ipojo/manipulator/pom.xml
@@ -29,11 +29,11 @@
<groupId>org.apache.felix</groupId>
<version>1.7.0-SNAPSHOT</version>
<name>Apache Felix iPOJO Manipulator</name>
-
+
<description>
iPOJO bytecode manipulator. This manipulator is used to instrument java classes in order to be managed by iPOJO.
</description>
-
+
<dependencies>
<dependency>
<groupId>asm</groupId>
@@ -71,11 +71,11 @@
org.apache.felix.ipojo.manipulation.annotations,
org.apache.felix.ipojo.xml.parser, org.objectweb.asm,
org.objectweb.asm.commons </Private-Package>
- <Include-Resource>
+ <Include-Resource>
META-INF/LICENSE=LICENSE,
- META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/LICENSE.asm=LICENSE.asm,
META-INF/NOTICE=NOTICE,
- xsd=src/main/resources,
+ xsd=src/main/resources,
META-INF/DEPENDENCIES=DEPENDENCIES
</Include-Resource>
<Import-Package>!org.objectweb.asm.tree, *</Import-Package>
@@ -96,6 +96,7 @@
<param>.checkstyle</param>
<param>.externalToolBuilders/*</param>
<param>LICENSE.asm</param>
+ <param>DEPENDENCIES</param>
</excludes>
</configuration>
</plugin>
@@ -109,5 +110,20 @@
</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>