You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/10/21 19:25:18 UTC
svn commit: r1633419 - in /myfaces/core/branches/2.1.x: api/pom.xml
bundle/pom.xml impl/pom.xml
Author: lu4242
Date: Tue Oct 21 17:25:18 2014
New Revision: 1633419
URL: http://svn.apache.org/r1633419
Log:
MYFACES-3928 MyFaces doesn't resolve in OSGi environment when Servlet API 3.1 is present (thanks to Achim Nierbeck for provide this patch)
Modified:
myfaces/core/branches/2.1.x/api/pom.xml
myfaces/core/branches/2.1.x/bundle/pom.xml
myfaces/core/branches/2.1.x/impl/pom.xml
Modified: myfaces/core/branches/2.1.x/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/pom.xml?rev=1633419&r1=1633418&r2=1633419&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/pom.xml (original)
+++ myfaces/core/branches/2.1.x/api/pom.xml Tue Oct 21 17:25:18 2014
@@ -74,6 +74,21 @@
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
<!-- license checker needs to exclude some kinds of files -->
<plugin>
<groupId>org.apache.rat</groupId>
@@ -371,7 +386,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
+ <version>2.5.3</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -394,17 +409,17 @@
<Import-Package>
javax.el;version="[1.0.0, 3.0.0)",
javax.validation*;version="[1.0.0, 2.0.0)",
- javax.servlet;version="[2.5.0, 3.1)",
- javax.servlet.http;version="[2.5.0, 3.1)",
+ javax.servlet;version="[2.5.0, 4.0)",
+ javax.servlet.http;version="[2.5.0, 4.0)",
javax.servlet.jsp;version="[2.1.0, 3.1)",
javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
javax.servlet.jsp.jstl.sql;version="[1.1.2, 2.0.0)",
- javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
+ javax.servlet.jsp.tagext;version="[2.1.0, 3.2)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
javax.faces.*;version="${project.version}"
</Import-Package>
<Require-Bundle>
- org.apache.myfaces.core.impl;bundle-version="${project.version}"
+ org.apache.myfaces.core.impl;bundle-version="${parsedVersion.osgiVersion}"
</Require-Bundle>
</instructions>
</configuration>
Modified: myfaces/core/branches/2.1.x/bundle/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/bundle/pom.xml?rev=1633419&r1=1633418&r2=1633419&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/bundle/pom.xml (original)
+++ myfaces/core/branches/2.1.x/bundle/pom.xml Tue Oct 21 17:25:18 2014
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.5.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -80,7 +80,7 @@
javax.servlet.jsp;version="[2.1.0, 3.1)",
javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
- javax.servlet.annotation;resolution:=optional,
+ javax.servlet.annotation;version="[2.5.0, 4.0)";resolution:=optional,
javax.validation.*;version="[1.0.0, 2.0.0)";resolution:=optional,
javax.xml.parsers,
org.apache;resolution:=optional,
Modified: myfaces/core/branches/2.1.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/pom.xml?rev=1633419&r1=1633418&r2=1633419&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/pom.xml (original)
+++ myfaces/core/branches/2.1.x/impl/pom.xml Tue Oct 21 17:25:18 2014
@@ -595,12 +595,12 @@
javax.naming,
javax.persistence;version="[1.0.0, 2.1)";resolution:=optional,
javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
- javax.servlet;version="[2.5.0, 3.1)",
- javax.servlet.http;version="[2.5.0, 3.1)",
+ javax.servlet;version="[2.5.0, 4.0)",
+ javax.servlet.http;version="[2.5.0, 4.0)",
javax.servlet.jsp;version="[2.1.0, 3.1)",
javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
- javax.servlet.annotation;resolution:=optional,
+ javax.servlet.annotation;version="[2.5.0, 4.0)";resolution:=optional,
javax.xml.parsers,
org.apache;resolution:=optional,
org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",