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/ipojo/webconsole-plugin@795564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doc/changelog.txt b/doc/changelog.txt
new file mode 100644
index 0000000..ce9d069
--- /dev/null
+++ b/doc/changelog.txt
@@ -0,0 +1,7 @@
+Version 1.4.0
+-------------
+** Improvement
+ * Update parent pom
+ * Initial commit
+
+
diff --git a/obr.xml b/obr.xml
new file mode 100644
index 0000000..59518cc
--- /dev/null
+++ b/obr.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+<obr>
+ <capability name="service">
+ <p n="service" v="javax.servlet.Servlet" />
+ <p n="felix.webconsole.label"
+ v="iPOJO" />
+ <p n="felix.webconsole.title"
+ v="iPOJO" />
+ <p n="service.vendor" v="The Apache Software Foundation" />
+ </capability>
+</obr>
diff --git a/pom.xml b/pom.xml
index 94f635b..3604015 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,23 @@
under the License.
-->
<project>
+ <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>
<packaging>bundle</packaging>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.webconsole</artifactId>
<version>1.3.0-SNAPSHOT</version>
- <name>Apche Felix iPOJO WebConsole Plugins</name>
+ <name>Apache Felix iPOJO WebConsole Plugin</name>
+
+ <description>
+ iPOJO plugin for the Apache Felix Web Console. This plugin allows introspecting an iPOJO system with the Apache Felix
+ Web Console.
+ </description>
+ <url>http://felix.apache.org/site/ipojo-webconsole-plugin.html</url>
<build>
<plugins>
@@ -43,10 +54,16 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}
</Bundle-SymbolicName>
+ <Bundle-DocURL>
+ http://felix.apache.org/site/ipojo-webconsole-plugin.html
+ </Bundle-DocURL>
<Private-Package>
org.apache.felix.org.apache.felix.ipojo.webconsole
</Private-Package>
<Import-Package>*</Import-Package>
+ <Include-Resource> META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
