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 2015/04/22 13:13:21 UTC
svn commit: r1675333 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-example/pom.xml
Author: lofwyr
Date: Wed Apr 22 11:13:21 2015
New Revision: 1675333
URL: http://svn.apache.org/r1675333
Log:
Merged from trunk
update TomEE to 1.7.1 [from revision 1675330]
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 11:13:21 2015
@@ -1,3 +1,3 @@
/myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
/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,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665569,1666464,1668147,1668153,1668249
+/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,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665569,1666464,1668147,1668153,1668249,1675330
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml?rev=1675333&r1=1675332&r2=1675333&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml Wed Apr 22 11:13:21 2015
@@ -66,10 +66,12 @@
<!-- usage: mvn clean package tomee:run -Djsf=provided -->
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.7.1</version>
<configuration>
- <tomeeVersion>1.5.0</tomeeVersion>
+ <tomeeVersion>1.7.1</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
+ <!--<tomeeHttpPort>9090</tomeeHttpPort>-->
+ <!--<context>/demo</context>-->
</configuration>
</plugin>
@@ -475,6 +477,27 @@
</build>
</profile>
+<!-- TBD: be needed for which cases?
+ <profile>
+ <id>303off</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.0.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.2.0.Final</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+-->
+
</profiles>
+
</project>