You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2018/10/14 11:16:27 UTC
svn commit: r1843825 - in /velocity/engine/trunk: pom.xml
src/changes/changes.xml velocity-engine-core/pom.xml
velocity-engine-examples/pom.xml velocity-engine-scripting/pom.xml
Author: cbrisson
Date: Sun Oct 14 11:16:27 2018
New Revision: 1843825
URL: http://svn.apache.org/viewvc?rev=1843825&view=rev
Log:
[VELOCITY-888] Include proper OSGi bundle informations in manifest files
Modified:
velocity/engine/trunk/pom.xml
velocity/engine/trunk/src/changes/changes.xml
velocity/engine/trunk/velocity-engine-core/pom.xml
velocity/engine/trunk/velocity-engine-examples/pom.xml
velocity/engine/trunk/velocity-engine-scripting/pom.xml
Modified: velocity/engine/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=1843825&r1=1843824&r2=1843825&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Sun Oct 14 11:16:27 2018
@@ -76,6 +76,29 @@
<arguments>-Papache-release</arguments>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.5.0</version>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: velocity/engine/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/changes/changes.xml?rev=1843825&r1=1843824&r2=1843825&view=diff
==============================================================================
--- velocity/engine/trunk/src/changes/changes.xml (original)
+++ velocity/engine/trunk/src/changes/changes.xml Sun Oct 14 11:16:27 2018
@@ -26,6 +26,9 @@
<body>
<release version="2.1" date="In subversion">
+ <action type="fix" dev="cbrisson" issue="VELOCITY-888">
+ Include proper OSGi bundle informations in manifest files
+ </action>
<action type="add" dev="cbrisson" issue="VELOCITY-898">
Alternate reference values: <code>${foo|'foo'}</code> evaluates to false whenever boolean evaluation of $foo is false
</action>
Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1843825&r1=1843824&r2=1843825&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Sun Oct 14 11:16:27 2018
@@ -179,6 +179,21 @@
<tokenManagerUsesParser>true</tokenManagerUsesParser>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.velocity.*
+ </Export-Package>
+ <Import-Package>
+ !org.apache.commons.io,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: velocity/engine/trunk/velocity-engine-examples/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/pom.xml?rev=1843825&r1=1843824&r2=1843825&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-examples/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-examples/pom.xml Sun Oct 14 11:16:27 2018
@@ -30,6 +30,15 @@
<name>Apache Velocity Engine - Examples</name>
<description>Very simple examples to use Velocity</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
Modified: velocity/engine/trunk/velocity-engine-scripting/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/pom.xml?rev=1843825&r1=1843824&r2=1843825&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-scripting/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-scripting/pom.xml Sun Oct 14 11:16:27 2018
@@ -74,6 +74,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>