KNL-817 merge r107539,109339,109471 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@110793 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-931 merge r108749 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@110800 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22481 - Did not mean to delete entire branches directory


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111285 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22394 - Merging maven plugin update


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111566 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-897 merge r105625 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111728 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-934 merge r111730 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111798 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-907 merge r106499 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111987 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-920 merge r107607 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111988 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-955 merge r111742 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111989 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-900 merge r106604,107065 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111990 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-926 merge r108564,109904 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111991 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-928 merge r108700 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111992 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-927 merge r108697 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111993 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-926 fix the 2.9.x build after the r108564 merge....


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@111995 66ffb92e-73f9-0310-93c1-f5514f145a0a
2.9.x / 1.3 merge

svn merge -c109616 -c109617 https://source.sakaiproject.org/svn/kernel/trunk/
--- Merging r109616 into '.':
D    kernel-impl/src/test/java/repositoryStubImpl.properties
D    loader
D    kernel-impl/src/test/java/org/sakaiproject/jcr
D    kernel-impl/src/main/java/org/sakaiproject/jcr
D    kernel-impl/src/main/java/org/apache
Conflict discovered in 'kernel-impl/pom.xml'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
U    kernel-impl/pom.xml
U    kernel-component/src/main/webapp/WEB-INF/components.xml
D    kernel-component/src/main/webapp/WEB-INF/jackrabbit-preloadcontent.xml
D    kernel-component/src/main/webapp/WEB-INF/jcr-support-components.xml
D    kernel-component/src/main/webapp/WEB-INF/jackrabbit-components.xml
D    src/src
U    pom.xml
U    deploy/assembly/pom.xml
U    deploy/shared/pom.xml
D    kernel-storage-util/src/main/java/org/sakaiproject/jcr
D    api/src/main/java/org/sakaiproject/jcr
D    api/src/main/src
U    api/pom.xml
--- Merging r109617 into '.':
G    pom.xml

svn log -c109616 -c109617 https://source.sakaiproject.org/svn/kernel/trunk/
------------------------------------------------------------------------
r109616 | steve.swinsburg@gmail.com | 2012-06-26 01:54:59 -0400 (Tue, 26 Jun 2012) | 1 line

KNL-940 remove JCR code from kernel
------------------------------------------------------------------------
r109617 | steve.swinsburg@gmail.com | 2012-06-26 02:05:43 -0400 (Tue, 26 Jun 2012) | 1 line

KNL-940 remove JCR artifacts from pom
------------------------------------------------------------------------



git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@113201 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-600 merge r112465,r112466,r113204,r113206,r113207 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@113271 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-356 merge r111983 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@113273 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-640 merge r112463 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@113276 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-749 merge r112369 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@113277 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-826 merge r106292,r106293,r106294 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@113279 66ffb92e-73f9-0310-93c1-f5514f145a0a