View File | Revision Log | Show Annotations | Download File | View Changeset
/hippo/hippo-cms7/essentials/branches/essentials-3.2.0-rest-api/plugins/simple-content/pom.xml
Revision 57394 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 22 12:20:36 2015 UTC (4 years, 3 months ago) by tjeger
File length: 1643 byte(s)
Diff to previous 56052
ESSENTIALS-818: copy for branch essentials-3.2.0-rest-api
Revision 56052 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 13 12:37:04 2015 UTC (4 years, 5 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1634 byte(s)
Diff to previous 55749
CMS-9583: prepare for next development iteration
Revision 55749 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 30 11:28:00 2015 UTC (4 years, 6 months ago) by uhommes
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1634 byte(s)
Diff to previous 55742
ESSENTIALS-770 correct version
Revision 55742 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 30 09:57:26 2015 UTC (4 years, 6 months ago) by uhommes
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1634 byte(s)
Diff to previous 55740
ESSENTIALS-777 rollback changes from release preparation of essentials-2.1.0-translations-1
Revision 55740 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 30 09:57:18 2015 UTC (4 years, 6 months ago) by uhommes
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1651 byte(s)
Diff to previous 55661
ESSENTIALS-777 prepare branch essentials-2.1.0-translations-1
Revision 55661 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 24 11:17:21 2015 UTC (4 years, 6 months ago) by imurasko
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1677 byte(s)
Diff to previous 55659
ESSENTIALS-770:prepare for next development iteration
Revision 55659 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 24 11:17:14 2015 UTC (4 years, 6 months ago) by imurasko
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1677 byte(s)
Diff to previous 55263
ESSENTIALS-770:prepare branch hippo-essentials-remove-related-docs-bean-from-bean-writer-2.1.x
Revision 55263 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Aug 11 13:10:33 2015 UTC (4 years, 7 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1634 byte(s)
Diff to previous 55018
CMS7-9483: prepare for next development iteration
Revision 55018 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 13 14:07:06 2015 UTC (4 years, 8 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1634 byte(s)
Diff to previous 55016
ESSENTIALS-745: prepare for next development iteration
Revision 55016 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 13 14:06:59 2015 UTC (4 years, 8 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1625 byte(s)
Diff to previous 54897
ESSENTIALS-745: prepare release hippo-essentials-2.0.0
Revision 54897 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jul 11 01:32:38 2015 UTC (4 years, 8 months ago) by adouma
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1634 byte(s)
Diff to previous 54849
CMS7-9450: Switch to using semantic versioning for all CMS 10 modules
- old version x.y.z => (x+1).0.0
- bumped to latest project or release parent pom
- also updated copyright year where needed
- cleaned up/moved dependency version properties to main pom.xml from child pom(s)
Revision 54849 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 6 12:18:48 2015 UTC (4 years, 9 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1636 byte(s)
Diff to previous 54847
CMS7-9428: prepare for next development iteration
Revision 54847 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 6 12:18:42 2015 UTC (4 years, 9 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1632 byte(s)
Diff to previous 54532
CMS7-9428: prepare release hippo-essentials-1.03.02-rc-1
Revision 54532 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 23 13:33:24 2015 UTC (4 years, 9 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1636 byte(s)
Diff to previous 54530
ESSENTIALS-724: prepare for next development iteration
Revision 54530 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 23 13:33:17 2015 UTC (4 years, 9 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1639 byte(s)
Diff to previous 54276
ESSENTIALS-724: prepare release hippo-essentials-1.03.02-milestone-2
Revision 54276 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 9 16:00:32 2015 UTC (4 years, 9 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1679 byte(s)
Diff to previous 54274
ESSENTIALS-724: prepare for next development iteration
Revision 54274 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 9 16:00:18 2015 UTC (4 years, 9 months ago) by abanck
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1682 byte(s)
Diff to previous 54083
ESSENTIALS-724: prepare release hippo-essentials-1.03.02-milestone-1
Revision 54083 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 3 11:03:06 2015 UTC (4 years, 10 months ago) by adouma
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 1636 byte(s)
Diff to previous 54079
ESSENTIALS-718: cleanup and prune project and maven configurations of unnecessary cruft
Revision 54079 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 3 10:16:45 2015 UTC (4 years, 10 months ago) by adouma
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3333 byte(s)
Diff to previous 53797
ESSENTIALS-715: major cleanup of unneeded, including some definitely unwanted, Essentials dependencies - this also cuts down the size of the dashboard.war by ~50Mb!
Revision 53797 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 11 09:31:16 2015 UTC (4 years, 10 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3817 byte(s)
Diff to previous 53795
ESSENTIALS-693: prepare for next development iteration
Revision 53795 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 11 09:31:05 2015 UTC (4 years, 10 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3808 byte(s)
Diff to previous 53726
ESSENTIALS-693: prepare release hippo-essentials-1.03.01
Revision 53726 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 4 10:21:06 2015 UTC (4 years, 11 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3817 byte(s)
Diff to previous 53724
ESSENTIALS-693: prepare for next development iteration
Revision 53724 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 4 10:20:56 2015 UTC (4 years, 11 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3808 byte(s)
Diff to previous 53154
ESSENTIALS-693: prepare release hippo-essentials-1.03.00
Revision 53154 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 14 11:57:38 2015 UTC (4 years, 11 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3817 byte(s)
Diff to previous 53152
ESSENTIALS-636: rollback changes from release preparation of hippo-essentials-1.03.00-alpha-1
Revision 53152 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 14 11:57:29 2015 UTC (4 years, 11 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3816 byte(s)
Diff to previous 51345
ESSENTIALS-636: prepare release hippo-essentials-1.03.00-alpha-1
Revision 51345 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Feb 9 13:05:35 2015 UTC (5 years, 1 month ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3817 byte(s)
Diff to previous 51334
ESSENTIALS-543: Updated copyright statement of files edited in 2015.
Revision 51334 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Feb 9 11:44:11 2015 UTC (5 years, 1 month ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3812 byte(s)
Diff to previous 51274
ESSENTIALS-504: Update artifact IDs.
Revision 51274 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Feb 4 10:17:45 2015 UTC (5 years, 2 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3800 byte(s)
Diff to previous 51273
ESSENTIALS-527: updated trunk version number.
Revision 51273 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 3 13:11:20 2015 UTC (5 years, 2 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3800 byte(s)
Diff to previous 51260
ESSENTIALS-526 Use web resources for Freemarker templates
- bump stuff to 7.10 snapshot
Revision 51260 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 19 08:30:39 2014 UTC (5 years, 3 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3947 byte(s)
Diff to previous 51216
Merge branch 'master' into ESSENTIALS-445
Revision 51216 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 20 11:55:12 2014 UTC (5 years, 5 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3947 byte(s)
Diff to previous 51215
[maven-release-plugin] prepare for next development iteration
Revision 51215 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 20 11:55:09 2014 UTC (5 years, 5 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3938 byte(s)
Diff to previous 51186
[maven-release-plugin] prepare release hippo-essentials-1.02.05
Revision 51186 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 19 08:34:49 2014 UTC (5 years, 6 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3947 byte(s)
Diff to previous 51185
[maven-release-plugin] prepare for next development iteration
Revision 51185 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 19 08:34:45 2014 UTC (5 years, 6 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3938 byte(s)
Diff to previous 51163
[maven-release-plugin] prepare release hippo-essentials-1.02.04
Revision 51163 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Sep 8 16:10:38 2014 UTC (5 years, 6 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3947 byte(s)
Diff to previous 51162
[maven-release-plugin] prepare for next development iteration
Revision 51162 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Sep 8 16:10:31 2014 UTC (5 years, 6 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3938 byte(s)
Diff to previous 51157
[maven-release-plugin] prepare release hippo-essentials-1.02.03
Revision 51157 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 5 13:51:47 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3947 byte(s)
Diff to previous 51156
[maven-release-plugin] prepare for next development iteration
Revision 51156 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 5 13:51:43 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3938 byte(s)
Diff to previous 51133
[maven-release-plugin] prepare release hippo-essentials-1.02.02
Revision 51133 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 3 13:18:18 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3947 byte(s)
Diff to previous 51121
Merge branch 'master' of github.com:onehippo/essentials
Revision 51121 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 3 12:41:49 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3947 byte(s)
Diff to previous 51120
[maven-release-plugin] prepare for next development iteration
Revision 51120 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 3 12:41:46 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3938 byte(s)
Diff to previous 51104
[maven-release-plugin] prepare release hippo-essentials-1.02.00
Revision 51104 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Sep 1 13:05:52 2014 UTC (5 years, 7 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/plugins/simple-content/pom.xml
File length: 3947 byte(s)
Copied from: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml revision 51103
Diff to previous 51103
improve naming of more modules / artifacts
Revision 51103 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Sep 1 11:58:23 2014 UTC (5 years, 7 months ago) by tjeger
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 3949 byte(s)
Diff to previous 50961
improve naming of modules / artifacts
Revision 50961 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:55:07 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50960
next release
Revision 50960 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:36:10 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4009 byte(s)
Diff to previous 50959
- manual release
Revision 50959 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:24:12 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50958
[maven-release-plugin] rollback the release of hippo-essentials-1.01.05
Revision 50958 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:20:30 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50957
[maven-release-plugin] prepare for next development iteration
Revision 50957 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:20:26 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4009 byte(s)
Diff to previous 50956
[maven-release-plugin] prepare release hippo-essentials-1.01.05
Revision 50956 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:05:51 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50955
[maven-release-plugin] rollback the release of hippo-essentials-1.01.05
Revision 50955 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:05:34 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4009 byte(s)
Diff to previous 50954
[maven-release-plugin] prepare release hippo-essentials-1.01.05
Revision 50954 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:04:08 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50953
[maven-release-plugin] rollback the release of hippo-essentials-1.01.05
Revision 50953 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 18 21:03:41 2014 UTC (5 years, 7 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4009 byte(s)
Diff to previous 50765
[maven-release-plugin] prepare release hippo-essentials-1.01.05
Revision 50765 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 7 13:13:48 2014 UTC (5 years, 8 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50764
[maven-release-plugin] prepare for next development iteration
Revision 50764 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 7 13:13:44 2014 UTC (5 years, 8 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4009 byte(s)
Diff to previous 50761
[maven-release-plugin] prepare release hippo-essentials-1.01.04
Revision 50761 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 7 12:45:35 2014 UTC (5 years, 8 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50760
- rollback release
Revision 50760 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 7 12:35:00 2014 UTC (5 years, 8 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50627
- next release
Revision 50627 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 23 10:04:13 2014 UTC (5 years, 9 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50430
- next version
Revision 50430 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 15 16:37:28 2014 UTC (5 years, 10 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50315
- next version
Revision 50315 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Apr 24 15:28:05 2014 UTC (5 years, 11 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 4018 byte(s)
Diff to previous 50308
- fix image path
Revision 50308 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Apr 23 16:10:25 2014 UTC (5 years, 11 months ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 3980 byte(s)
Diff to previous 50139
- add copyright notice(s)
Revision 50139 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 25 14:51:16 2014 UTC (6 years ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 3374 byte(s)
Diff to previous 50138
- fix filtering & path names
Revision 50138 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 25 14:42:58 2014 UTC (6 years ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 3336 byte(s)
Diff to previous 50132
- add more default filters
Revision 50132 - (view) (download) (as text) (annotate) - [select for diffs]
Added Mon Mar 24 21:14:32 2014 UTC (6 years ago) by mmilicevic
Original Path: hippo-cms7/essentials/trunk/dashboard-plugins/simple-content/pom.xml
File length: 2948 byte(s)
- capitalize file names
- add simple content project skeleton
(Current path doesn't exist after revision 57396)

Convenience Links

Links to HEAD: (view) (download) (as text) (annotate)

Compare Revisions

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a