Author: cziegeler
Date: Tue Aug 6 12:58:41 2013
New Revision: 1510951
URL: http://svn.apache.org/r1510951
Log:
SLING-2996 : use project.* properties instead of pom.* properties . Apply
patch from Oliver Lietz
Modified:
sling/trunk/contrib/extensions/apt/parser/pom.xml
sling/trunk/contrib/extensions/apt/servlet/pom.xml
sling/trunk/contrib/scripting/freemarker/pom.xml
sling/trunk/contrib/scripting/jst/pom.xml
sling/trunk/contrib/scripting/python/pom.xml
sling/trunk/contrib/scripting/ruby/pom.xml
sling/trunk/contrib/scripting/scala/script/pom.xml
sling/trunk/contrib/scripting/velocity/pom.xml
sling/trunk/contrib/scripting/xproc/pom.xml
sling/trunk/samples/simple-demo/pom.xml
sling/trunk/samples/simple-launchpad/pom.xml
sling/trunk/samples/webloader/service/pom.xml
Modified: sling/trunk/contrib/extensions/apt/parser/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/apt/parser/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/apt/parser/pom.xml (original)
+++ sling/trunk/contrib/extensions/apt/parser/pom.xml Tue Aug 6 12:58:41 2013
@@ -56,7 +56,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.apt.parser;version=${pom.version}
+
org.apache.sling.apt.parser;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.sling.apt.parser.internal,
Modified: sling/trunk/contrib/extensions/apt/servlet/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/apt/servlet/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/apt/servlet/pom.xml (original)
+++ sling/trunk/contrib/extensions/apt/servlet/pom.xml Tue Aug 6 12:58:41 2013
@@ -52,7 +52,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Export-Package>org.apache.sling.apt.servlet.*;version=${pom.version}</Export-Package>
+
<Export-Package>org.apache.sling.apt.servlet.*;version=${project.version}</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: sling/trunk/contrib/scripting/freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/pom.xml (original)
+++ sling/trunk/contrib/scripting/freemarker/pom.xml Tue Aug 6 12:58:41 2013
@@ -77,8 +77,8 @@
org.python.*;resolution:=optional, *
</Import-Package>
- <ScriptEngine-Name>${pom.name}</ScriptEngine-Name>
-
<ScriptEngine-Version>${pom.version}</ScriptEngine-Version>
+ <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
+
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
</instructions>
</configuration>
</plugin>
Modified: sling/trunk/contrib/scripting/jst/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/jst/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/jst/pom.xml (original)
+++ sling/trunk/contrib/scripting/jst/pom.xml Tue Aug 6 12:58:41 2013
@@ -83,8 +83,8 @@
javax.xml.*, *
</Import-Package>
- <ScriptEngine-Name>${pom.name}</ScriptEngine-Name>
-
<ScriptEngine-Version>${pom.version}</ScriptEngine-Version>
+ <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
+
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
</instructions>
</configuration>
</plugin>
Modified: sling/trunk/contrib/scripting/python/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/python/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/python/pom.xml (original)
+++ sling/trunk/contrib/scripting/python/pom.xml Tue Aug 6 12:58:41 2013
@@ -60,8 +60,8 @@
<Embed-Dependency>jython;inline=true</Embed-Dependency>
<Import-Package>!org.python.*,javax.jcr.*</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
- <ScriptEngine-Name>${pom.name}</ScriptEngine-Name>
-
<ScriptEngine-Version>${pom.version}</ScriptEngine-Version>
+ <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
+
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
</instructions>
</configuration>
</plugin>
Modified: sling/trunk/contrib/scripting/ruby/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/ruby/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/ruby/pom.xml (original)
+++ sling/trunk/contrib/scripting/ruby/pom.xml Tue Aug 6 12:58:41 2013
@@ -62,8 +62,8 @@
com.sun.*;org.apache.bsf.*;sun.*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
- <ScriptEngine-Name>${pom.name}</ScriptEngine-Name>
-
<ScriptEngine-Version>${pom.version}</ScriptEngine-Version>
+ <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
+
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
</instructions>
</configuration>
</plugin>
Modified: sling/trunk/contrib/scripting/scala/script/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/script/pom.xml Tue Aug 6 12:58:41 2013
@@ -103,8 +103,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <ScriptEngine-Name>${pom.name}</ScriptEngine-Name>
-
<ScriptEngine-Version>${pom.version}</ScriptEngine-Version>
+ <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
+
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
<Export-Package>
org.apache.sling.scripting.scala.*
</Export-Package>
Modified: sling/trunk/contrib/scripting/velocity/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/velocity/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/velocity/pom.xml (original)
+++ sling/trunk/contrib/scripting/velocity/pom.xml Tue Aug 6 12:58:41 2013
@@ -72,8 +72,8 @@
org.jdom.*;resolution:=optional, *
</Import-Package>
- <ScriptEngine-Name>${pom.name}</ScriptEngine-Name>
-
<ScriptEngine-Version>${pom.version}</ScriptEngine-Version>
+ <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
+
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
</instructions>
</configuration>
</plugin>
Modified: sling/trunk/contrib/scripting/xproc/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/xproc/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/xproc/pom.xml (original)
+++ sling/trunk/contrib/scripting/xproc/pom.xml Tue Aug 6 12:58:41 2013
@@ -58,8 +58,8 @@
org.apache.sling.scripting.xproc.*
</Private-Package>
<Embed-Dependency>cocoon-pipeline;inline=true</Embed-Dependency>
- <ScriptEngine-Name>${pom.name}</ScriptEngine-Name>
-
<ScriptEngine-Version>${pom.version}</ScriptEngine-Version>
+ <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
+
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
</instructions>
</configuration>
</plugin>
Modified: sling/trunk/samples/simple-demo/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/simple-demo/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/samples/simple-demo/pom.xml (original)
+++ sling/trunk/samples/simple-demo/pom.xml Tue Aug 6 12:58:41 2013
@@ -91,7 +91,7 @@
<!-- we have to export for the classes to be visible
-->
<Export-Package>
org.apache.sling.sample;
- org.apache.jsp.*;version=${pom.version}
+ org.apache.jsp.*;version=${project.version}
</Export-Package>
<!-- node types to be created -->
Modified: sling/trunk/samples/simple-launchpad/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/simple-launchpad/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/samples/simple-launchpad/pom.xml (original)
+++ sling/trunk/samples/simple-launchpad/pom.xml Tue Aug 6 12:58:41 2013
@@ -68,7 +68,7 @@
<configuration>
<contextPath>/</contextPath>
<webAppSourceDirectory>
- target/${artifactId}-${pom.version}
+ target/${artifactId}-${project.version}
</webAppSourceDirectory>
</configuration>
</plugin>
Modified: sling/trunk/samples/webloader/service/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/webloader/service/pom.xml?rev=1510951&r1=1510950&r2=1510951&view=diff
==============================================================================
--- sling/trunk/samples/webloader/service/pom.xml (original)
+++ sling/trunk/samples/webloader/service/pom.xml Tue Aug 6 12:58:41 2013
@@ -57,7 +57,7 @@
<configuration>
<instructions>
<Export-Package>
-
org.apache.sling.samples.webloader;version=${pom.version}
+
org.apache.sling.samples.webloader;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.sling.samples.webloader.internal
