Fix license issue
Update changelog
Upgrade some settings in the configuration test suite
Add the obr.xml file for the web console plugin
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@795564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/ant/LICENSE.asm b/ipojo/ant/LICENSE.asm
index 9496b17..cc529ed 100644
--- a/ipojo/ant/LICENSE.asm
+++ b/ipojo/ant/LICENSE.asm
@@ -1,28 +1,29 @@
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ipojo/ant/NOTICE b/ipojo/ant/NOTICE
index 96d5a77..60f6348 100644
--- a/ipojo/ant/NOTICE
+++ b/ipojo/ant/NOTICE
@@ -19,4 +19,4 @@
III. License Summary
- Apache License 2.0
-- BSD Licence
+- BSD License
diff --git a/ipojo/ant/doc/changelog.txt b/ipojo/ant/doc/changelog.txt
index ff3c93a..34adf7b 100644
--- a/ipojo/ant/doc/changelog.txt
+++ b/ipojo/ant/doc/changelog.txt
@@ -1,3 +1,12 @@
+Changes from 1.2.0 to 1.4.0
+---------------------------
+** Bug
+ * [FELIX-1302] - Manipulator never ignore annotations
+
+** Improvement
+ * Update parent pom
+
+
Changes from 1.0.0 to 1.2.0
---------------------------
** Improvement
@@ -13,4 +22,4 @@
Version 0.8.1
-------------
- * Initial release
\ No newline at end of file
+ * Initial release
diff --git a/ipojo/ant/pom.xml b/ipojo/ant/pom.xml
index c9b29be..422ca13 100644
--- a/ipojo/ant/pom.xml
+++ b/ipojo/ant/pom.xml
@@ -29,6 +29,14 @@
<version>1.3.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Ant Task</name>
+
+ <description>
+ Ant task to package iPOJO-powered bundles.
+ </description>
+ <url>
+ http://felix.apache.org/site/ipojo-ant-task.html
+ </url>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -63,6 +71,7 @@
<Bundle-Name>iPOJO Ant Task</Bundle-Name>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
<Bundle-Description> iPOJO Ant Task </Bundle-Description>
+ <Bundle-DocURL>http://felix.apache.org/site/ipojo-ant-task.html</Bundle-DocURL>
<Private-Package> org.apache.felix.ipojo.metadata,
org.apache.felix.ipojo.manipulator,
org.apache.felix.ipojo.xml.parser,
@@ -75,9 +84,10 @@
org.apache.xerces.dom.*, org.apache.xerces.dom3.*
</Private-Package>
<Export-Package> org.apache.felix.ipojo.task </Export-Package>
- <Include-Resource> META-INF/LICENCE=LICENSE,
+ <Include-Resource> META-INF/LICENSE=LICENSE,
META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
+ <Import-Package>!org.objectweb.asm.signature, !org.objectweb.asm.tree, !org.objectweb.asm.tree.analysis, *</Import-Package>
</instructions>
<obrRepository>NONE</obrRepository>
</configuration>