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/core/DEPENDENCIES b/ipojo/core/DEPENDENCIES
index b28d3f5..4855e33 100644
--- a/ipojo/core/DEPENDENCIES
+++ b/ipojo/core/DEPENDENCIES
@@ -1,11 +1,11 @@
Apache Felix iPOJO Runtime
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
The OSGi Alliance (http://www.osgi.org/).
@@ -16,7 +16,7 @@
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 OSGi Alliance (http://www.osgi.org/).
diff --git a/ipojo/core/doc/changelog.txt b/ipojo/core/doc/changelog.txt
index aee08b3..114bf35 100644
--- a/ipojo/core/doc/changelog.txt
+++ b/ipojo/core/doc/changelog.txt
@@ -3,7 +3,10 @@
** Improvement
* [FELIX-2420] - Enum support for @Property annotation
* [FELIX-2461] - Allow specifying the targeted service interface in the @ServiceController
- * [FELIX-2472] - Proxies should throw a runtime exception instead of a null point exception
+ * [FELIX-2472] - Proxies should throw a runtime exception instead of a null pointer exception
+
+** Bug
+ * [FELIX-2561] - Properties set as required instead of optional in the component type descriptions
Changes from the 1.6.0 to 1.6.2
-------------------------------
@@ -34,17 +37,17 @@
* [FELIX-1854] - Allows instances to directly declares service.* properties (pid, ranking, vendor, description)
* [FELIX-1885] - Ease CreationStrategy & iPOJOServiceFactory usage
* [FELIX-1906] - Allow calling a method when service properties of an already injected service are modified
-
+
** New Feature
* [FELIX-2132] - Provides a way to control service exposition from the implementation class
-
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug
* [FELIX-985] - iPOJO analyzes already installed bundle by holding a lock
* [FELIX-1002] - iPOJO Static binding policy is not compliant with the Declarative Service static binding policy.
- * [FELIX-1318] - Case mismatch problem of iPOJO custom handler name
+ * [FELIX-1318] - Case mismatch problem of iPOJO custom handler name
** Improvement
* Update parent pom
* [FELIX-936] - Allowing publishing class as services
@@ -53,8 +56,8 @@
* [FELIX-1114] - callback after configuration change needed
* [FELIX-1163] - Improve error message when an array cannot be created due to a classloading issue
* [FELIX-1182] - iPOJO - reconfiguration : get all properties with the update callback
-
-
+
+
Changes from 1.0.0 to 1.2.0
---------------------------
** Bug
@@ -72,35 +75,35 @@
* [FELIX-818] - Implement the ServiceReference compareTo method
* [FELIX-853] - Provide new service object creation strategies
* New introspection API
-
+
Changes from 0.8.0 to 1.0.0
---------------------------
-** Bug
+** Bug
* [FELIX-557] - Factories still living when a primitive component does not have its manipulation metadata
* [FELIX-632] - Component are set to immediate despite they are already immediate
* [FELIX-635] - Simplify factory name computation
* [FELIX-628] - Architecture service should not publish the instance.name property
* [FELIX-621] - Instances not disposed when instances creation failed
-
+
** Improvement
* [FELIX-552] - ClassCastException when using services as dynamic proxies
* [FELIX-555] - Error message in the iPOJO Extender could be more accurate when failing to get the bundle context
- * [FELIX-558] - Non caught NoClassDefFoundError when the instantiation of a Nullable object failed
- * [FELIX-603] - Improve iPOJO Arch service dependency description
- * [FELIX-626] - Allow specifying instance configuration containing empty dictionaries
+ * [FELIX-558] - Non caught NoClassDefFoundError when the instantiation of a Nullable object failed
+ * [FELIX-603] - Improve iPOJO Arch service dependency description
+ * [FELIX-626] - Allow specifying instance configuration containing empty dictionaries
* [FELIX-629] - Allows instance configuration to declares complex properties
* [FELIX-631] - Immediate Component Detection
- * [FELIX-633] - Factory creation should be done in another thread
- * [FELIX-634] - Improve error handling
+ * [FELIX-633] - Factory creation should be done in another thread
+ * [FELIX-634] - Improve error handling
* [FELIX-655] - Add a 'from' attribute in the service dependencies
* [FELIX-673] - Provide OBR description to iPOJO bundles
* [FELIX-683] - Supporting lists and vectors in the service dependency management
* [FELIX-686] - Supporting collections and set in the service dependency management
- * [FELIX-688] - Better error reporting when an instance creation failed
+ * [FELIX-688] - Better error reporting when an instance creation failed
* [FELIX-689] - Instance 'name' property should become 'instance.name'
- * [FELIX-716] - Provide XML schemas for iPOJO descriptors
- * [FELIX-732] - Duplicate instance created of a managed service
-
+ * [FELIX-716] - Provide XML schemas for iPOJO descriptors
+ * [FELIX-732] - Duplicate instance created of a managed service
+
Version 0.8.0
-------------
* Initial release
diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index a47db9e..35d395b 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -33,7 +33,7 @@
<properties>
<ipojo.package.version>1.6.0</ipojo.package.version>
</properties>
-
+
<description>
iPOJO Core bundle
</description>
@@ -155,6 +155,7 @@
<param>.externalToolBuilders/*</param>
<param>LICENSE.asm</param>
<param>.fbprefs</param>
+ <param>DEPENDENCIES</param>
</excludes>
</configuration>
</plugin>
@@ -168,5 +169,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>