Author: justin
Date: Tue May 4 21:17:40 2010
New Revision: 941046
URL: http://svn.apache.org/viewvc?rev=941046&view=rev
Log:
SLING-1517 - fixing Maven 3 warnings and switching to released version of
animal sniffer
Modified:
sling/trunk/bundles/api/pom.xml
sling/trunk/bundles/commons/json/pom.xml
sling/trunk/bundles/commons/mime/pom.xml
sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml
sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml
sling/trunk/bundles/jcr/ocm/pom.xml
sling/trunk/bundles/jcr/resource/pom.xml
sling/trunk/bundles/scripting/javascript/pom.xml
sling/trunk/bundles/scripting/jsp-taglib/pom.xml
sling/trunk/bundles/scripting/jsp/pom.xml
sling/trunk/launchpad/builder/pom.xml
sling/trunk/maven/maven-jcrocm-plugin/pom.xml
sling/trunk/maven/maven-jspc-plugin/pom.xml
sling/trunk/maven/maven-sling-plugin/pom.xml
sling/trunk/parent/pom.xml
Modified: sling/trunk/bundles/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/api/pom.xml (original)
+++ sling/trunk/bundles/api/pom.xml Tue May 4 21:17:40 2010
@@ -83,7 +83,7 @@
http://sling.apache.org/site/sling-api.html
</Bundle-DocURL>
<Export-Package>
- org.apache.sling.api.*;version=${pom.version}
+ org.apache.sling.api.*;version=${project.version}
</Export-Package>
<!-- Require explicit version of the servlet API -->
<Import-Package>
Modified: sling/trunk/bundles/commons/json/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/commons/json/pom.xml (original)
+++ sling/trunk/bundles/commons/json/pom.xml Tue May 4 21:17:40 2010
@@ -49,7 +49,7 @@
<configuration>
<instructions>
<Export-Package>
-
org.apache.sling.commons.json.*;version=${pom.version}
+
org.apache.sling.commons.json.*;version=${project.version}
</Export-Package>
</instructions>
</configuration>
Modified: sling/trunk/bundles/commons/mime/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/mime/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/commons/mime/pom.xml (original)
+++ sling/trunk/bundles/commons/mime/pom.xml Tue May 4 21:17:40 2010
@@ -58,7 +58,7 @@
http://sling.apache.org/site/mime-type-support.html
</Bundle-DocURL>
<Export-Package>
-
org.apache.sling.commons.mime;version=${pom.version}
+
org.apache.sling.commons.mime;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.sling.commons.mime.internal
Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml Tue May 4
21:17:40 2010
@@ -62,8 +62,8 @@
<Private-Package>
</Private-Package>
<Export-Package>
-
org.apache.sling.jcr.jackrabbit.accessmanager;version=${pom.version},
-
org.apache.sling.jcr.jackrabbit.accessmanager.post;version=${pom.version}
+
org.apache.sling.jcr.jackrabbit.accessmanager;version=${project.version},
+
org.apache.sling.jcr.jackrabbit.accessmanager.post;version=${project.version}
</Export-Package>
<Sling-Initial-Content />
<Sling-Nodetypes />
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml Tue May 4 21:17:40
2010
@@ -61,7 +61,7 @@
<configuration>
<instructions>
<Export-Package>
-
org.apache.sling.jackrabbit.usermanager;version=${pom.version},
+
org.apache.sling.jackrabbit.usermanager;version=${project.version},
</Export-Package>
<Private-Package>
org.apache.sling.jackrabbit.usermanager.impl.*
Modified: sling/trunk/bundles/jcr/ocm/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/ocm/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/ocm/pom.xml (original)
+++ sling/trunk/bundles/jcr/ocm/pom.xml Tue May 4 21:17:40 2010
@@ -69,7 +69,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.jcr.ocm;version=${pom.version},
+
org.apache.sling.jcr.ocm;version=${project.version},
org.apache.jackrabbit.ocm.exception;
org.apache.jackrabbit.ocm.mapper;
org.apache.jackrabbit.ocm.manager;
Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Tue May 4 21:17:40 2010
@@ -74,7 +74,7 @@
*
</Import-Package>
<Export-Package>
-
org.apache.sling.jcr.resource;version=${pom.version}
+
org.apache.sling.jcr.resource;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.sling.jcr.resource.internal.*
Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Tue May 4 21:17:40 2010
@@ -61,8 +61,8 @@
!org.mozilla.javascript.xml.impl.xmlbeans,
org.mozilla.javascript.*
</Private-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/bundles/scripting/jsp-taglib/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Tue May 4 21:17:40 2010
@@ -50,7 +50,7 @@
<configuration>
<instructions>
<Export-Package>
-
org.apache.sling.scripting.jsp.taglib.*;version=${pom.version}
+
org.apache.sling.scripting.jsp.taglib.*;version=${project.version}
</Export-Package>
<Import-Package>
javax.jcr;resolution:=optional,
Modified: sling/trunk/bundles/scripting/jsp/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp/pom.xml Tue May 4 21:17:40 2010
@@ -69,8 +69,8 @@
!org.eclipse.*, *
</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>
<!-- Embed Jasper completely -->
<Embed-Dependency>
Modified: sling/trunk/launchpad/builder/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/pom.xml (original)
+++ sling/trunk/launchpad/builder/pom.xml Tue May 4 21:17:40 2010
@@ -198,7 +198,7 @@
launcher modules
-->
<webAppSourceDirectory>
- target/${artifactId}-${pom.version}
+ target/${project.artifactId}-${project.version}
</webAppSourceDirectory>
<webAppConfig>
<contextPath>${jetty.sling.context}</contextPath>
Modified: sling/trunk/maven/maven-jcrocm-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-jcrocm-plugin/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/maven/maven-jcrocm-plugin/pom.xml (original)
+++ sling/trunk/maven/maven-jcrocm-plugin/pom.xml Tue May 4 21:17:40 2010
@@ -51,6 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: sling/trunk/maven/maven-jspc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-jspc-plugin/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/maven/maven-jspc-plugin/pom.xml (original)
+++ sling/trunk/maven/maven-jspc-plugin/pom.xml Tue May 4 21:17:40 2010
@@ -48,6 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: sling/trunk/maven/maven-sling-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-sling-plugin/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/maven/maven-sling-plugin/pom.xml (original)
+++ sling/trunk/maven/maven-sling-plugin/pom.xml Tue May 4 21:17:40 2010
@@ -48,6 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: sling/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=941046&r1=941045&r2=941046&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Tue May 4 21:17:40 2010
@@ -22,6 +22,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>7</version>
+ <relativePath />
</parent>
<groupId>org.apache.sling</groupId>
@@ -315,7 +316,7 @@ MAVEN_OPTS="-Xmx256M -XX:MaxPermSize=128
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.5</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
