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/06/03 17:37:10 UTC
svn commit: r1683374 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-assembly/src/main/resources/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/e...
Author: lofwyr
Date: Wed Jun 3 15:37:10 2015
New Revision: 1683374
URL: http://svn.apache.org/r1683374
Log:
Merged from trunk
set (c) year to 2015 [from revision 1683373]
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/src/main/resources/NOTICE.txt
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 3 15:37:10 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,1656502,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665569,1666464,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1679031,1680197,1681981,1682448,1682545,1682548,1683231,1683306
+/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,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665569,1666464,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1679031,1680197,1681981,1682448,1682545,1682548,1683231,1683306,1683373
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/src/main/resources/NOTICE.txt?rev=1683374&r1=1683373&r2=1683374&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/src/main/resources/NOTICE.txt Wed Jun 3 15:37:10 2015
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2014 The Apache Software Foundation
+Copyright 2005-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java?rev=1683374&r1=1683373&r2=1683374&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java Wed Jun 3 15:37:10 2015
@@ -19,7 +19,7 @@
/**
* <b>Tobago Framework Component Tag Library 3.0.x -
- * (C) Copyright 2005-2014 The Apache Software Foundation</b>
+ * (C) Copyright 2005-2015 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tc",
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java?rev=1683374&r1=1683373&r2=1683374&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java Wed Jun 3 15:37:10 2015
@@ -19,7 +19,7 @@
/**
* <b>Tobago Framework Extension Tag Library 3.0.x -
- * (C) Copyright 2005-2014 The Apache Software Foundation</b>
+ * (C) Copyright 2005-2015 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tx",
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt?rev=1683374&r1=1683373&r2=1683374&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt Wed Jun 3 15:37:10 2015
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2014 The Apache Software Foundation
+Copyright 2005-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java?rev=1683374&r1=1683373&r2=1683374&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java Wed Jun 3 15:37:10 2015
@@ -19,7 +19,7 @@
/**
* <b>Tobago Framework Sandbox Tag Library 3.0.x -
- * (C) Copyright 2002-2014 The Apache Software Foundation</b>
+ * (C) Copyright 2002-2015 The Apache Software Foundation</b>
*
* <b>Warning: The sandbox tag library contains unstable components.
* Everything is subject to change without prior notice.</b>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt?rev=1683374&r1=1683373&r2=1683374&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt Wed Jun 3 15:37:10 2015
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2014 The Apache Software Foundation
+Copyright 2005-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).