Author: clement
Date: Sat Apr 14 10:08:58 2012
New Revision: 1326081
URL: http://svn.apache.org/viewvc?rev=1326081&view=rev
Log:
Updates changelog, pom and copyright years.
Modified:
felix/trunk/ipojo/metadata/DEPENDENCIES
felix/trunk/ipojo/metadata/NOTICE
felix/trunk/ipojo/metadata/doc/changelog.txt
felix/trunk/ipojo/metadata/pom.xml
Modified: felix/trunk/ipojo/metadata/DEPENDENCIES
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/DEPENDENCIES?rev=1326081&r1=1326080&r2=1326081&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/DEPENDENCIES (original)
+++ felix/trunk/ipojo/metadata/DEPENDENCIES Sat Apr 14 10:08:58 2012
@@ -1,5 +1,5 @@
Apache Felix iPOJO Metadata
-Copyright 2008-2011 The Apache Software Foundation
+Copyright 2008-2012 The Apache Software Foundation
This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
Modified: felix/trunk/ipojo/metadata/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/NOTICE?rev=1326081&r1=1326080&r2=1326081&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/NOTICE (original)
+++ felix/trunk/ipojo/metadata/NOTICE Sat Apr 14 10:08:58 2012
@@ -1,5 +1,5 @@
Apache Felix iPOJO Metadata
-Copyright 2008-2011 The Apache Software Foundation
+Copyright 2008-2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: felix/trunk/ipojo/metadata/doc/changelog.txt
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/doc/changelog.txt?rev=1326081&r1=1326080&r2=1326081&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/doc/changelog.txt (original)
+++ felix/trunk/ipojo/metadata/doc/changelog.txt Sat Apr 14 10:08:58 2012
@@ -1,3 +1,9 @@
+Changes from 1.6.0 to 1.6.1
+---------------------------
+** Improvement
+ * [FELIX-3131] - Elements and attributes should conserve the insertion
order
+
+
Changes from 1.4.0 to 1.6.0
---------------------------
** Improvement
Modified: felix/trunk/ipojo/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/pom.xml?rev=1326081&r1=1326080&r2=1326081&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/pom.xml (original)
+++ felix/trunk/ipojo/metadata/pom.xml Sat Apr 14 10:08:58 2012
@@ -16,69 +16,84 @@
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/maven-v4_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.metadata</artifactId>
+<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/maven-v4_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.metadata</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Apache Felix iPOJO Metadata</name>
+ <version>1.6.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache Felix iPOJO Metadata</name>
- <description>
- iPOJO internal metadata model.
- </description>
+ <description>
+ iPOJO internal metadata model.
+ </description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>iPOJO Metadata</Bundle-Name>
- <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Metadata </Bundle-Description>
- <Export-Package> org.apache.felix.ipojo.metadata </Export-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- META-INF/DEPENDENCIES=DEPENDENCIES
- </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>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
-
<configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <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>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>iPOJO Metadata</Bundle-Name>
+ <Bundle-Vendor>The Apache Software
Foundation</Bundle-Vendor>
+ <Bundle-Description>iPOJO Metadata</Bundle-Description>
+
<Export-Package>org.apache.felix.ipojo.metadata</Export-Package>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </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>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+
<configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
