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/annotations/doc/changelog.txt b/ipojo/annotations/doc/changelog.txt
index f3d9feb..6dbbdb9 100644
--- a/ipojo/annotations/doc/changelog.txt
+++ b/ipojo/annotations/doc/changelog.txt
@@ -1,3 +1,12 @@
+Changes from 1.2.0 to 1.4.0
+---------------------------
+** Bug
+ * [FELIX-1319] - Issue in the metadata overriding analysis in iPOJO annotations
+
+** Improvement
+ * Update parent pom
+
+
Changes from 1.0.0 to 1.2.0
---------------------------
** Improvement
@@ -17,4 +26,4 @@
Version 0.8.0
-------------
- * Initial release
\ No newline at end of file
+ * Initial release
diff --git a/ipojo/annotations/pom.xml b/ipojo/annotations/pom.xml
index 2c34444..44e0799 100644
--- a/ipojo/annotations/pom.xml
+++ b/ipojo/annotations/pom.xml
@@ -1,91 +1,101 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ 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.0</version>
- <relativePath>../../pom/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <groupId>org.apache.felix</groupId>
- <version>1.3.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Apache Felix iPOJO Annotations</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>iPOJO Annotations</Bundle-Name>
- <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Annotations </Bundle-Description>
- <Export-Package> org.apache.felix.ipojo.annotations,
- org.apache.felix.ipojo.handler.temporal,
- org.apache.felix.ipojo.handlers.jmx,
- org.apache.felix.ipojo.extender,
- org.apache.felix.ipojo.whiteboard,
- org.apache.felix.ipojo.handlers.event,
- org.apache.felix.ipojo.transaction
- </Export-Package>
- <Include-Resource> META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
- </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>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</version>
+ <relativePath>../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache Felix iPOJO Annotations</name>
+
+ <description>
+ iPOJO Annotation pack. contained annotaitons are used to define iPOJO component type.
+ </description>
+ <url>
+ http://felix.apache.org/site/how-to-use-ipojo-annotations.html
+ </url>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>iPOJO Annotations</Bundle-Name>
+ <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
+ <Bundle-Description> iPOJO Annotations </Bundle-Description>
+ <Bundle-DocURL>http://felix.apache.org/site/how-to-use-ipojo-annotations.html</Bundle-DocURL>
+ <Export-Package> org.apache.felix.ipojo.annotations,
+ org.apache.felix.ipojo.handler.temporal,
+ org.apache.felix.ipojo.handlers.jmx,
+ org.apache.felix.ipojo.extender,
+ org.apache.felix.ipojo.whiteboard,
+ org.apache.felix.ipojo.handlers.event,
+ org.apache.felix.ipojo.transaction
+ </Export-Package>
+ <Include-Resource> META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE </Include-Resource>
+ </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>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>