You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/03/30 12:05:26 UTC
svn commit: r1789507 - in /myfaces/tobago/branches/TOBAGO-1719: ./ pom.xml
tobago-example/pom.xml tobago-example/tobago-example-demo/pom.xml
Author: lofwyr
Date: Thu Mar 30 12:05:26 2017
New Revision: 1789507
URL: http://svn.apache.org/viewvc?rev=1789507&view=rev
Log:
Merged from trunk
added mojarra-2.3 profile [from revision 1789406]
removed prerequisites as this is only intended for maven-plugin projects but not for non maven-plugin projects. see also MNG-6092 [from revision 1789409]
Modified:
myfaces/tobago/branches/TOBAGO-1719/ (props changed)
myfaces/tobago/branches/TOBAGO-1719/pom.xml
myfaces/tobago/branches/TOBAGO-1719/tobago-example/pom.xml
myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/pom.xml
Propchange: myfaces/tobago/branches/TOBAGO-1719/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 30 12:05:26 2017
@@ -1,4 +1,4 @@
/myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
/myfaces/tobago/branches/tobago-3.0.x:1781306,1781310,1781380
/myfaces/tobago/branches/tobago-tree-table:1226794-1341423
-/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443,1787651,1787780,1787926,1788112,1788115,1788125,1788196,1788214-1788215,1788225,1788239,1788381,1788385,1788392,1788484,1788502,1789295,1789305,1789309,1789347-1789348,1789354,1789364,1789366,1789379-1789380
+/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443,1787651,1787780,1787926,1788112,1788115,1788125,1788196,1788214-1788215,1788225,1788239,1788381,1788385,1788392,1788484,1788502,1789295,1789305,1789309,1789347-1789348,1789354,1789364,1789366,1789379-1789380,1789406,1789409
Modified: myfaces/tobago/branches/TOBAGO-1719/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/pom.xml?rev=1789507&r1=1789506&r2=1789507&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/pom.xml (original)
+++ myfaces/tobago/branches/TOBAGO-1719/pom.xml Thu Mar 30 12:05:26 2017
@@ -28,9 +28,6 @@
<name>Apache Tobago</name>
<version>3.1.0.bs4a6-SNAPSHOT</version>
<description>The goal of Tobago is to provide the community with a well designed set of user interface components based on JSF and run on MyFaces.</description>
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
<url>http://myfaces.apache.org/tobago</url>
<inceptionYear>2002</inceptionYear>
@@ -41,6 +38,7 @@
<mojarra20.version>2.0.11-04</mojarra20.version>
<mojarra21.version>2.1.29-08</mojarra21.version>
<mojarra22.version>2.2.14</mojarra22.version>
+ <mojarra23.version>2.3.0</mojarra23.version>
<slf4j.version>1.7.22</slf4j.version>
<logback.version>1.1.8</logback.version>
<commons-collection.version>3.2.2</commons-collection.version>
@@ -1372,6 +1370,31 @@
</dependencyManagement>
</profile>
+ <profile>
+ <id>mojarra-2.3</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>mojarra-2.3</value>
+ </property>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>javax.faces-api</artifactId>
+ <version>2.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.faces</artifactId>
+ <version>${mojarra23.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
</profiles>
<contributors>
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-example/pom.xml?rev=1789507&r1=1789506&r2=1789507&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-example/pom.xml (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-example/pom.xml Thu Mar 30 12:05:26 2017
@@ -388,6 +388,33 @@
</profile>
<profile>
+ <id>mojarra-2.3</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>mojarra-2.3</value>
+ </property>
+ </activation>
+ <properties>
+ <override-web-xml>../src/test/jetty/override-mojarra-web.xml</override-web-xml>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>javax.faces-api</artifactId>
+ <version>2.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.faces</artifactId>
+ <version>${mojarra23.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
<id>liberty</id>
<!--
<properties>
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/pom.xml?rev=1789507&r1=1789506&r2=1789507&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/pom.xml Thu Mar 30 12:05:26 2017
@@ -604,6 +604,58 @@
</profile>
<profile>
+ <id>mojarra-2.3</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>mojarra-2.3</value>
+ </property>
+ </activation>
+ <dependencies>
+
+ <!-- Specs -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- OWB -->
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+ </dependencies>
+ </profile>
+
+ <profile>
<!--
mvn package cargo:start -Ptomcat7x
XXX not working yet