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 2016/08/25 02:24:39 UTC
svn commit: r1757591 - in /myfaces/core/branches/2.3.x: api/ impl/
impl/src/main/java/org/apache/myfaces/config/annotation/
impl/src/main/java/org/apache/myfaces/spi/impl/
impl/src/main/resources/META-INF/services/ parent/ shared-public/ shared/
Author: lu4242
Date: Thu Aug 25 02:24:39 2016
New Revision: 1757591
URL: http://svn.apache.org/viewvc?rev=1757591&view=rev
Log:
update dependencies and remove unused code
Removed:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/spi/impl/TomcatAnnotationInjectionProvider.java
Modified:
myfaces/core/branches/2.3.x/api/pom.xml
myfaces/core/branches/2.3.x/impl/pom.xml
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider
myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider
myfaces/core/branches/2.3.x/parent/pom.xml
myfaces/core/branches/2.3.x/shared-public/pom.xml
myfaces/core/branches/2.3.x/shared/pom.xml
Modified: myfaces/core/branches/2.3.x/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/pom.xml?rev=1757591&r1=1757590&r2=1757591&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/pom.xml (original)
+++ myfaces/core/branches/2.3.x/api/pom.xml Thu Aug 25 02:24:39 2016
@@ -615,7 +615,7 @@
<!-- JSP 2.1 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
</dependency>
<!-- JSTL 1.2 -->
@@ -645,7 +645,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
</dependency>
<dependency>
Modified: myfaces/core/branches/2.3.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/pom.xml?rev=1757591&r1=1757590&r2=1757591&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/pom.xml (original)
+++ myfaces/core/branches/2.3.x/impl/pom.xml Thu Aug 25 02:24:39 2016
@@ -41,7 +41,7 @@
</scm>
<properties>
- <openwebbeans.version>1.2.1</openwebbeans.version>
+ <openwebbeans.version>1.2.8</openwebbeans.version>
</properties>
<build>
@@ -750,9 +750,9 @@
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, 4.0)",
- javax.servlet.http;version="[2.5.0, 4.0)",
- javax.servlet.jsp;version="[2.1.0, 3.1)",
+ javax.servlet;version="[3.0.0, 4.0)",
+ javax.servlet.http;version="[3.0.0, 4.0)",
+ javax.servlet.jsp;version="[2.2.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;version="[2.5.0, 4.0)";resolution:=optional,
@@ -1098,38 +1098,6 @@
</pluginRepositories>
</profile>
- <profile>
- <id>ee5</id>
- <dependencies>
- <!-- disable Servlet 3.0 -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>test</scope> <!-- just to make it go away -->
- </dependency>
-
- <!-- and enable Servlet 2.5 -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/java/org/apache/myfaces/ee6</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
@@ -1175,7 +1143,7 @@
<!-- JSP 2.1 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
</dependency>
<!-- JSTL 1.2 -->
@@ -1224,7 +1192,7 @@
<!-- CDI -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
</dependency>
<!-- builder-annotations like @JSFWebConfigParam -->
@@ -1255,13 +1223,6 @@
<artifactId>commons-digester</artifactId>
</dependency>
- <!-- tomcat 6.0.x support (LifecycleProvider) -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
- </dependency>
-
<!-- tomcat 7 support (LifecycleProvider) -->
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java?rev=1757591&r1=1757590&r2=1757591&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java Thu Aug 25 02:24:39 2016
@@ -39,7 +39,7 @@ public class Tomcat7AnnotationLifecycleP
DiscoverableLifecycleProvider, LifecycleProvider2
{
- private static Logger log = Logger.getLogger(TomcatAnnotationLifecycleProvider.class.getName());
+ private static Logger log = Logger.getLogger(Tomcat7AnnotationLifecycleProvider.class.getName());
private WeakHashMap<ClassLoader, InstanceManager> instanceManagers = null;
Modified: myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider?rev=1757591&r1=1757590&r2=1757591&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider Thu Aug 25 02:24:39 2016
@@ -1,2 +1 @@
-org.apache.myfaces.config.annotation.TomcatAnnotationLifecycleProvider
org.apache.myfaces.config.annotation.Tomcat7AnnotationLifecycleProvider
\ No newline at end of file
Modified: myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider?rev=1757591&r1=1757590&r2=1757591&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider Thu Aug 25 02:24:39 2016
@@ -1,3 +1,2 @@
org.apache.myfaces.spi.impl.CDIAnnotationDelegateInjectionProvider
-org.apache.myfaces.spi.impl.TomcatAnnotationInjectionProvider
org.apache.myfaces.spi.impl.Tomcat7AnnotationInjectionProvider
\ No newline at end of file
Modified: myfaces/core/branches/2.3.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/parent/pom.xml?rev=1757591&r1=1757590&r2=1757591&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/parent/pom.xml (original)
+++ myfaces/core/branches/2.3.x/parent/pom.xml Thu Aug 25 02:24:39 2016
@@ -60,13 +60,13 @@
<plugins>
- <!-- JDK 1.5 -->
+ <!-- JDK 1.8 -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
@@ -359,14 +359,6 @@
<!-- SPEC DEPENDENCIES -->
- <!-- Servlet 2.5 (for ee5 compat compile) -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Servlet 3.0 (for ee6) -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -375,17 +367,17 @@
<scope>provided</scope>
</dependency>
- <!-- JSP 2.1 -->
+ <!-- JSP 2.2 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0.1</version>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
<exclusions>
<!-- we want to use el 2.2 -->
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -456,7 +448,7 @@
<!-- CDI 1.0 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
<version>1.0</version>
<scope>provided</scope>
<!-- MYFACES-3917 set compile/optional, clashes
@@ -515,15 +507,6 @@
<!-- SPI DEPENDENCIES (compile + optional) -->
- <!-- tomcat 6.0.x support (LifecycleProvider) -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>6.0.29</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
<!-- tomcat 7 support (LifecycleProvider) -->
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -542,7 +525,6 @@
<optional>true</optional>
</dependency>
-
<!-- TEST DEPENDENCIES -->
<dependency>
Modified: myfaces/core/branches/2.3.x/shared-public/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/shared-public/pom.xml?rev=1757591&r1=1757590&r2=1757591&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/shared-public/pom.xml (original)
+++ myfaces/core/branches/2.3.x/shared-public/pom.xml Thu Aug 25 02:24:39 2016
@@ -46,16 +46,16 @@
<artifactId>myfaces-api</artifactId>
</dependency>
- <!-- Servlet 2.5 -->
+ <!-- Servlet 3.0 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<!-- JSP 2.1 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
</dependency>
<!-- el 2.2 (javax.el.*) -->
Modified: myfaces/core/branches/2.3.x/shared/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/shared/pom.xml?rev=1757591&r1=1757590&r2=1757591&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/shared/pom.xml (original)
+++ myfaces/core/branches/2.3.x/shared/pom.xml Thu Aug 25 02:24:39 2016
@@ -61,7 +61,7 @@
<!-- JSP 2.1 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
</dependency>
<!-- el 2.2 (javax.el.*) -->
Re: svn commit: r1757591 - in /myfaces/core/branches/2.3.x: api/
impl/ impl/src/main/java/org/apache/myfaces/config/annotation/
impl/src/main/java/org/apache/myfaces/spi/impl/ impl/src/main/resources/META-INF/services/
parent/ shared-public/ shared/
Posted by Leonardo Uribe <lu...@gmail.com>.
Hi
2016-08-25 4:40 GMT-05:00 Mike Kienenberger <mk...@gmail.com>:
> Should we consider switching to tomee instead of geronimo for J2EE 7?
> It seems like more development is happening in tomee than geronimo
> from the board reports (april, may, july) and visible project
> activity.
>
>
Probably yes. Recently I have been playing with tomee maven plugins, and
you can switch libraries easily. For now we need to switch the test cases
from CDI 1 to CDI 2.
regards,
Leonardo Uribe
> http://www.apache.org/foundation/board/calendar.html#2016
>
>
> On Wed, Aug 24, 2016 at 10:24 PM, <lu...@apache.org> wrote:
> > URL: http://svn.apache.org/viewvc?rev=1757591&view=rev
> > Log:
> > update dependencies and remove unused code
> >
>
> ============================================================
> ==================
> > --- myfaces/core/branches/2.3.x/api/pom.xml (original)
> > +++ myfaces/core/branches/2.3.x/api/pom.xml Thu Aug 25 02:24:39 2016
> > @@ -615,7 +615,7 @@
> > <!-- JSP 2.1 -->
> > <dependency>
> > <groupId>org.apache.geronimo.specs</groupId>
> > - <artifactId>geronimo-jsp_2.1_spec</artifactId>
> > + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> > </dependency>
> >
> > <!-- JSTL 1.2 -->
> > @@ -645,7 +645,7 @@
> >
> > <dependency>
> > <groupId>org.apache.geronimo.specs</groupId>
> > - <artifactId>geronimo-jcdi_1.0_spec</artifactId>
> > + <artifactId>geronimo-jcdi_1.1_spec</artifactId>
>
Re: svn commit: r1757591 - in /myfaces/core/branches/2.3.x: api/
impl/ impl/src/main/java/org/apache/myfaces/config/annotation/
impl/src/main/java/org/apache/myfaces/spi/impl/ impl/src/main/resources/META-INF/services/
parent/ shared-public/ shared/
Posted by Mike Kienenberger <mk...@gmail.com>.
Should we consider switching to tomee instead of geronimo for J2EE 7?
It seems like more development is happening in tomee than geronimo
from the board reports (april, may, july) and visible project
activity.
http://www.apache.org/foundation/board/calendar.html#2016
On Wed, Aug 24, 2016 at 10:24 PM, <lu...@apache.org> wrote:
> URL: http://svn.apache.org/viewvc?rev=1757591&view=rev
> Log:
> update dependencies and remove unused code
>
==============================================================================
> --- myfaces/core/branches/2.3.x/api/pom.xml (original)
> +++ myfaces/core/branches/2.3.x/api/pom.xml Thu Aug 25 02:24:39 2016
> @@ -615,7 +615,7 @@
> <!-- JSP 2.1 -->
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> </dependency>
>
> <!-- JSTL 1.2 -->
> @@ -645,7 +645,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jcdi_1.0_spec</artifactId>
> + <artifactId>geronimo-jcdi_1.1_spec</artifactId>