Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-33994 12.x merge. Removed unused standalone and tomahawk (#5617)

  1. … 68 more files in changeset.
Switching Sakai back to 12-SNAPSHOT

  1. … 420 more files in changeset.
Releasing Sakai 12.1

  1. … 420 more files in changeset.
Switching Sakai back to 12-SNAPSHOT

  1. … 421 more files in changeset.
Releasing Sakai 12.0

  1. … 421 more files in changeset.
SAK-33994 remove unused tomahawk dependency (#5386)

* SAK-33994 remove unused tomahawk dependency

* SAK-33994 remove edu-services standalone dirs

* SAK-33994 remove integrationssupport dependencies

  1. … 68 more files in changeset.
Updating Sakai master to 13-SNAPSHOT

  1. … 443 more files in changeset.
Switching Sakai back to 11-SNAPSHOT

  1. … 500 more files in changeset.
Releasing Sakai 11.4

  1. … 500 more files in changeset.
SAK-32530 edu-services (#4414)

* -serial version ID

-scoring-service: raw type

* -commons-lang3

- raw type

- serial version ID

* SAK-32530: tabs/spaces

  1. … 24 more files in changeset.
Switching Sakai back to 11-SNAPSHOT

  1. … 500 more files in changeset.
Releasing Sakai 11.3

  1. … 500 more files in changeset.
KNL-945 Hibernate upgrade from 3.6 to 4.3 (#3719)

  1. … 492 more files in changeset.
Switching Sakai back to 11-SNAPSHOT

  1. … 499 more files in changeset.
Releasing Sakai 11.2

  1. … 499 more files in changeset.
SAK-30828 Normalize logging for 11.x (#3346)

* SAK-30828 Normalize sakai logging

- remove commons-logging (jcl)

- add logging to those projects where it was removed

- convert System.out to log messages in many projects

- add jcl-over-slf4j lib

- update many dependencies to inherit from master

- update logging for tests

- add lombok to global dependency (@Slf4j)

Conflicts:

basiclti/tsugi-util/pom-tsugi.xml

content-review/impl/dao/pom.xml

content-review/impl/turnitin/pom.xml

content-review/pom.xml

entitybroker/utils/pom.xml

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/Temp.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java

* SAK-30828 switch log4j logging to slf4j

* SAK-30828 switch jcl logging to slf4j

Conflicts:

assignment/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java

assignment/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/DbAssignmentService.java

basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIReportingJob.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/util/TurnitinAPIUtil.java

kernel/kernel-impl/src/main/java/org/sakaiproject/event/impl/BaseLearningResourceStoreService.java

lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java

portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/GenerateBugReportHandler.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/QuestionScoreListener.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/questionpool/PoolSaveListener.java

signup/impl/src/java/org/sakaiproject/signup/logic/SignupMeetingServiceImpl.java

syllabus/syllabus-impl/src/java/org/sakaiproject/component/app/syllabus/SyllabusServiceImpl.java

* SAK-30828 slf4j-log4j12 binding should be provided

* SAK-30828 Lombok @CommonsLog migrated to @Slf4j

Conflicts:

content-review/impl/dao/src/test/java/org/sakaiproject/contentreview/dao/ContentReviewDaoImplTest.java

content-review/impl/service/src/main/java/org/sakaiproject/contentreview/service/ContentReviewFederatedServiceImpl.java

content-review/impl/service/src/main/java/org/sakaiproject/contentreview/service/ContentReviewQueueServiceImpl.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinAccountConnection.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinContentValidator.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinReviewServiceImpl.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinSessionFuncs.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/util/TurnitinAPIUtil.java

content-review/impl/vericite/src/main/java/org/sakaiproject/contentreview/vericite/ContentReviewServiceVeriCite.java

* SAK-30828 content-review slf4j conversion

* SAK-31420 Issue with import from site not working due to logger serialization (#3169)

  1. … 1945 more files in changeset.
Switching Sakai back to 11-SNAPSHOT

  1. … 498 more files in changeset.
Releasing Sakai 11.1

  1. … 498 more files in changeset.
Switching Sakai back to 11-SNAPSHOT

  1. … 498 more files in changeset.
Releasing Sakai 11.0

  1. … 498 more files in changeset.
SAK-30828 Normalize sakai logging

- remove commons-logging (jcl)

- add logging to those projects where it was removed

- convert System.out to log messages in many projects

- add jcl-over-slf4j lib

- update many dependencies to inherit from master

- update logging for tests

- add lombok to global dependency (@Slf4j)

  1. … 366 more files in changeset.
SAK-30488 Commons Collections lib to use version in master

  1. … 24 more files in changeset.
SAK-30488 Commons Collections lib to use version in master

  1. … 24 more files in changeset.
SAK-30345 Updated all the standard versions.

mvn -f master/pom.xml versions:set -DnewVersion=12-SNAPSHOT -DgenerateBackupPoms=false

  1. … 491 more files in changeset.
SAK-25544 Upgrade to spring 4.1.8

Upgrading Spring to version 4.1.8 required

- Quartz 2.2.1 upgrade

- All xml files were updated to the modern XSD beans definition

- Many Tests were updated to using the newer ContextConfiguration

- Annotation as the old AbstractDependencyInjectionSpringContextTests was

removed and tests are now run with AbstractJUnit4SpringContextTests.

- Hibernate 3.6 is still supported in spring 4.1 but not in spring 4.2

- HibernateTemplate's *All methods were removed

- HibernateTemplate.find* needs explicit cast to List<?>

- All Kernel tests were updated to the junit 4 style, and many others

elsewhere

- Kernel test harness was removed as it's not needed

- ContextLoaderListener had some minor changes and was renamed to

SakaiContextLoaderListener (This is what binds sakai component

application context to webapps)

- GenericDAO lib was added to common and also upgraded to spring 4.1

- RSF was also upgraded to spring 4.1, see RSF-16

  1. … 456 more files in changeset.
SAK-26107 remove unused ehcache dep

git-svn-id: https://source.sakaiproject.org/svn/edu-services/trunk@309164 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 2 more files in changeset.
SAK-25742 update trunk to 11-SNAPSHOT

git-svn-id: https://source.sakaiproject.org/svn/edu-services/trunk@306125 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 22 more files in changeset.
SAK-25386 update trunk poms to 10.0-SNAPSHOT as well as out-dated 2.10 references.

git-svn-id: https://source.sakaiproject.org/svn/edu-services/trunk@131633 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 18 more files in changeset.
SAK-23907 moving version to 2.10

git-svn-id: https://source.sakaiproject.org/svn/edu-services/trunk@129506 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 18 more files in changeset.
KNL-515 and KNL-517 - Upgrade Spring to 3.2.3 and Hibernate to 3.6.1

Mega merge of https://github.com/botimer/sakai-cle/tree/spring-32

git-svn-id: https://source.sakaiproject.org/svn/edu-services/trunk@125281 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 33 more files in changeset.