Skip to content

Commit

Permalink
release cut done for 2.3.4, now move to 2.3.5-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
ruolli committed Apr 5, 2018
1 parent 7a05fbd commit 563416f
Show file tree
Hide file tree
Showing 268 changed files with 282 additions and 282 deletions.
4 changes: 2 additions & 2 deletions common/ant/common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<property name="spec.version" value="2.3"/>
<property name="spec_version" value="2_3"/>
<property name="spec.snapshot.version" value="2.3-mr1-SNAPSHOT"/>
<property name="patch.version" value="4"/>
<property name="patch.version" value="5"/>
<property name="impl.name" value="Mojarra"/>
<property name="build.number" value="${DSTAMP}-${TSTAMP}"/>
<property name="build.type" value="-SNAPSHOT"/>
Expand Down Expand Up @@ -222,7 +222,7 @@

<!-- this is hard coded to match the values in ${basedir}/jsf-tools/pom.xml -->
<property name="jsf-tools.jar"
value="${maven.repo.local}/com/sun/faces/build/jsf-tools/${impl.version.number}/jsf-tools-${impl.version.number}.jar" />
value="${maven.repo.local}/com/sun/faces/build/jsf-tools/${snapshot.version}/jsf-tools-${snapshot.version}.jar" />

<!-- Test classpaths that are used in multiple places within the project -->
<path id="junit.classpath">
Expand Down
2 changes: 1 addition & 1 deletion jsf-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.faces.build</groupId>
<artifactId>jsf-tools</artifactId>
<version>2.3.4</version>
<version>2.3.5-SNAPSHOT</version>
<description>
Java code executed at build time
</description>
Expand Down
4 changes: 2 additions & 2 deletions nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<type>org.netbeans.modules.ant.freeform</type>
<configuration>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
<name>mojarra-2.3.3-SNAPSHOT</name>
<name>mojarra-2.3.5-SNAPSHOT</name>
</general-data>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
<!-- Do not use Project Properties customizer when editing this file manually. -->
<name>mojarra-2.3.4-SNAPSHOT</name>
<name>mojarra-2.3.5-SNAPSHOT</name>
<properties>
<property-file>build.properties</property-file>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion test/cluster/javaee6web/flow/basic_faces_flow_call/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.cluster.javaee6web.flow</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster.javaee6web.flow</groupId>
<artifactId>basic_faces_flow_call</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/cluster/javaee6web/flow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<parent>
<groupId>com.sun.faces.test.cluster.javaee6web</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster.javaee6web.flow</groupId>
<artifactId>pom</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions test/cluster/javaee6web/noAggressiveSessionDirtying/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
<parent>
<artifactId>pom</artifactId>
<groupId>com.sun.faces.test.cluster.javaee6web</groupId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<artifactId>noAggressiveSessionDirtying</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
<packaging>war</packaging>
<name>Mojarra ${project.version} - Test - Cluster - JavaEE 6 Web - No Aggressive Session Dirtying</name>
<build>
Expand Down
2 changes: 1 addition & 1 deletion test/cluster/javaee6web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<parent>
<groupId>com.sun.faces.test.cluster</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster.javaee6web</groupId>
<artifactId>pom</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions test/cluster/javaee6web/viewScoped/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<parent>
<artifactId>pom</artifactId>
<groupId>com.sun.faces.test.cluster.javaee6web</groupId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>

<groupId>com.sun.faces.test.cluster.javaee6web</groupId>
<artifactId>viewScoped</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
<packaging>war</packaging>
<name>Mojarra ${project.version} - Test - Cluster - JavaEE 6 Web - ViewScoped test</name>

Expand Down
2 changes: 1 addition & 1 deletion test/cluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/cluster/servlet25/bytearrayguard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<parent>
<groupId>com.sun.faces.test.cluster.servlet25</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster.servlet25</groupId>
<artifactId>bytearrayguard</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/cluster/servlet25/flash/basic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<parent>
<artifactId>pom</artifactId>
<groupId>com.sun.faces.test.cluster.servlet25.flash</groupId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster.servlet25.flash</groupId>
<artifactId>basic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/cluster/servlet25/flash/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.cluster.servlet25</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster.servlet25.flash</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/cluster/servlet25/flash/reaper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<parent>
<artifactId>pom</artifactId>
<groupId>com.sun.faces.test.cluster.servlet25.flash</groupId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster.servlet25.flash</groupId>
<artifactId>reaper</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/cluster/servlet25/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<parent>
<groupId>com.sun.faces.test.cluster</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.cluster.servlet25</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/admingui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<artifactId>admingui</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/bundle22/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>bundle22</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/facelets/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish.facelets</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish.facelets</groupId>
<artifactId>core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/facelets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish.facelets</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<artifactId>jpa</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/request_char_encoding/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>request_char_encoding</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/request_char_encoding2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>request_char_encoding2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/undeploy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish.undeploy</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/undeploy/undeploy1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish.undeploy</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish.undeploy</groupId>
<artifactId>undeploy1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/glassfish/undeploy/undeploy2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.glassfish.undeploy</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.glassfish.undeploy</groupId>
<artifactId>undeploy2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/groovy/basic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<parent>
<groupId>com.sun.faces.test.groovy</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.groovy</groupId>
<artifactId>basic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/groovy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<parent>
<groupId>com.sun.faces.test</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.groovy</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/groovy/weldAware/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<parent>
<groupId>com.sun.faces.test.groovy</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.groovy</groupId>
<artifactId>weldAware</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/correctScanningEar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<artifactId>correctScanningEar</artifactId>
<packaging>ear</packaging>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/correctScanningJar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<artifactId>correctScanningJar</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/correctScanningTest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<artifactId>correctScanningTest</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/correctScanningWar1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<artifactId>correctScanningWar1</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/correctScanningWar2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<artifactId>correctScanningWar2</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<parent>
<groupId>com.sun.faces.test</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.javaee6</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/resource/cacheLastMod/ear/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<name>Mojarra ${project.version} - Test - JavaEE 6 - resource - cacheLastMod - ear</name>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/resource/cacheLastMod/jar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<name>Mojarra ${project.version} - Test - JavaEE 6 - resource - cacheLastMod - jar</name>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/resource/cacheLastMod/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6.resource</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/resource/cacheLastMod/war-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<name>Mojarra ${project.version} - Test - JavaEE 6 - resource - cacheLastMod - war-test</name>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/resource/cacheLastMod/war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<name>Mojarra ${project.version} - Test - JavaEE 6 - resource - cacheLastMod - war</name>
<groupId>com.sun.faces.test.javaee6.resource.cacheLastMod</groupId>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/resource/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<parent>
<groupId>com.sun.faces.test.javaee6</groupId>
<artifactId>pom</artifactId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>
<groupId>com.sun.faces.test.javaee6.resource</groupId>
<artifactId>pom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/viewParamBeanValidatorNotNull/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<parent>
<artifactId>pom</artifactId>
<groupId>com.sun.faces.test.javaee6</groupId>
<version>2.3.4-SNAPSHOT</version>
<version>2.3.5-SNAPSHOT</version>
</parent>

<artifactId>viewParamBeanValidatorNotNull</artifactId>
Expand Down
Loading

0 comments on commit 563416f

Please sign in to comment.