Prepare for the next release:
* Added missing license header
* Updatee changelogs
* Fixed build
* Added LICENSE, NOTICE and DEPENDENCIES files
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1210959 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt b/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt
index d86850f..d401551 100644
--- a/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt
+++ b/ipojo/manipulator/ipojo-ant-task/doc/changelog.txt
@@ -1,3 +1,22 @@
+Changes from the 1.8.0 to 1.8.2
+-------------------------------
+
+** Bug
+ * [FELIX-2825] - The maven-ipojo-plugin does not replace component classes in WAR files
+ * [FELIX-3012] - "Duplicate name&signature" problem
+ * [FELIX-3098] - iPOJO new manipulator crashes when using a custom reporter
+ * [FELIX-3145] - VerifyError on Java 7
+ * [FELIX-3249] - iPOJO Bnd Plugin do not write all the metadatas in the manifest
+
+** Improvement
+ * [FELIX-3017] - The manipulator should return the original class if it's already manipulated
+ * [FELIX-3078] - Introduce resource abstraction in the iPOJO manipulator
+ * [FELIX-3079] - Adapt the Ant task and the maven plugin to use the new manipulator capabilities
+ * [FELIX-3080] - Implement a BND plugin for iPOJO
+ * [FELIX-3131] - Elements and attributes should conserve the insertion order
+ * [FELIX-3204] - @Temporal should handle instantiation-time properties
+ * [FELIX-3244] - Manipulator : DefaultManifestBuilder should be more extensible
+
Changes from the 1.6.0 to 1.8.0
-------------------------------
** Improvement
diff --git a/ipojo/manipulator/ipojo-ant-task/pom.xml b/ipojo/manipulator/ipojo-ant-task/pom.xml
index dd31d00..915aa78 100644
--- a/ipojo/manipulator/ipojo-ant-task/pom.xml
+++ b/ipojo/manipulator/ipojo-ant-task/pom.xml
@@ -16,119 +16,144 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
- <relativePath>../../../pom/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.felix.ipojo.ant</artifactId>
- <groupId>org.apache.felix</groupId>
- <version>1.9.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>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.9.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>iPOJO Ant Task</Bundle-Name>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <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,
- org.apache.felix.ipojo.manipulation*,
- org.objectweb.asm.util;-split-package:=merge-first,
- org.objectweb.asm;-split-package:=merge-first,
- org.objectweb.asm.commons;-split-package:=merge-first,
- org.apache.xerces.parsers, org.apache.xerces.xni*,
- org.apache.xerces.impl*, org.apache.xerces.util.*,
- org.apache.xerces.dom.*, org.apache.xerces.dom3.*
- </Private-Package>
- <Export-Package> org.apache.felix.ipojo.task </Export-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/DEPENDENCIES=DEPENDENCIES
- </Include-Resource>
- <Import-Package>!org.objectweb.asm.signature, !org.objectweb.asm.tree, !org.objectweb.asm.tree.analysis, *</Import-Package>
- </instructions>
- <obrRepository>NONE</obrRepository>
- </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>
- <param>LICENSE.asm</param>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <enableRulesSummary>false</enableRulesSummary>
- <violationSeverity>warning</violationSeverity>
- <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.1</version>
+ <relativePath>../../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.felix.ipojo.ant</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <version>1.9.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>
+ <artifactId>org.apache.felix.ipojo.metadata</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>iPOJO Ant Task</Bundle-Name>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <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,
+ org.apache.felix.ipojo.manipulation*,
+ org.objectweb.asm.util;-split-package:=merge-first,
+ org.objectweb.asm;-split-package:=merge-first,
+ org.objectweb.asm.commons;-split-package:=merge-first,
+ org.apache.xerces.parsers, org.apache.xerces.xni*,
+ org.apache.xerces.impl*, org.apache.xerces.util.*,
+ org.apache.xerces.dom.*, org.apache.xerces.dom3.*
+ </Private-Package>
+ <Export-Package>org.apache.felix.ipojo.task</Export-Package>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
+ <Import-Package>!org.objectweb.asm.signature, !org.objectweb.asm.tree,
+ !org.objectweb.asm.tree.analysis, *
+ </Import-Package>
+ </instructions>
+ <obrRepository>NONE</obrRepository>
+ </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>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>