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/04/05 13:56:19 UTC
svn commit: r1790264 - in /myfaces/tobago/branches/TOBAGO-1719: ./
tobago-example/tobago-example-demo/pom.xml
Author: lofwyr
Date: Wed Apr 5 13:56:18 2017
New Revision: 1790264
URL: http://svn.apache.org/viewvc?rev=1790264&view=rev
Log:
Merged from trunk
dependency updates for integration tests [from revision 1789568]
fix mojarra-2.3 profile for demo [from revision 1789645]
Modified:
myfaces/tobago/branches/TOBAGO-1719/ (props changed)
myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/pom.xml
Propchange: myfaces/tobago/branches/TOBAGO-1719/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 5 13:56:18 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,1789406,1789409,1789500
+/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,1789500,1789568,1789645
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=1790264&r1=1790263&r2=1790264&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 Wed Apr 5 13:56:18 2017
@@ -29,12 +29,12 @@
<properties>
<openwebbeans.version>1.2.8</openwebbeans.version>
- <deltaspike.version>1.7.1</deltaspike.version>
+ <deltaspike.version>1.7.2</deltaspike.version>
<!--<arquillian.browser>firefox</arquillian.browser>-->
<!-- phantomjs works not with CSP (report-only) -->
<arquillian.browser>phantomjs</arquillian.browser>
- <selenium.version>3.0.1</selenium.version>
- <tomee.version>7.0.1</tomee.version>
+ <selenium.version>3.3.1</selenium.version>
+ <tomee.version>7.0.3</tomee.version>
</properties>
<build>
<finalName>tobago-example-demo</finalName>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
- <version>1.1.12.Final</version>
+ <version>1.1.13.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -170,16 +170,27 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-bom</artifactId>
- <version>2.0.1.Final</version>
+ <version>2.1.0.Alpha3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.graphene</groupId>
<artifactId>graphene-webdriver</artifactId>
- <version>2.1.0.Final</version>
+ <version>2.2.0</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>21.0</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -616,13 +627,13 @@
<!-- Specs -->
<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>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- <version>1.1</version>
+ <artifactId>geronimo-validation_1.1_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -631,25 +642,26 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
<version>1.0</version>
</dependency>
<!-- OWB -->
+ <!-- TODO check if ${openwebbeans.version} can be updated -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>1.7.2</version>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>1.7.2</version>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-resource</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>1.7.2</version>
</dependency>
</dependencies>