We're updating the issue view to help you get more done. 

Merges for 1.2 need to come across to trunk

Description

I updated trunk and branch 1.2.x to the same head version, version 11029. I then attempted to merge the two to determine where conflicts may still lie:

cd /opt/matterhorn/matterhorn_trunk
svn merge --dry-run https://opencast.jira.com/svn/MH/branches/1.2.x .

Here are the conflicting files I saw (lots of updated files, I am presuming these are as expected. They may not be, ymmv).

Adam:
C modules/matterhorn-capture-admin-service-impl/src/main/java/org/opencastproject/capture/admin/endpoint/CaptureAgentStateRestService.java

Rubencino:
C modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/persistence/SeriesServiceDatabaseImpl.java
C modules/matterhorn-series-service-impl/src/main/resources/solr/conf/schema.xml
C modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/SolrRequester.java
C modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/Schema.java

Markus:
CG modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.scheduler.js
C modules/matterhorn-admin-ui/src/main/resources/ui/scheduler.html
C modules/matterhorn-admin-ui/src/main/resources/ui/upload.html
C modules/matterhorn-admin-ui/src/main/resources/ui/css/admin.css
C modules/matterhorn-admin-ui/src/main/resources/ui/series_list.html
C modules/matterhorn-admin-ui/src/main/resources/ui/series.html
C modules/matterhorn-admin-ui/src/main/resources/ui/recordings.html
CG modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.series.list.js
CG modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.upload.new.js
CG modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.scheduler.js
CG modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.recordings.js
CG modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.utils.js

C modules/matterhorn-userdirectory-ldap/src/main/java/org/opencastproject/userdirectory/ldap/LdapUserProvider.java
C modules/matterhorn-dublincore/src/main/java/org/opencastproject/metadata/dublincore/DublinCoreCatalogImpl.java
C modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/userdirectory/UserAndRoleDirectoryServiceImpl.java

Tobias:
C modules/matterhorn-conductor/src/main/resources/ui/operation/trim/index.html
C modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/ApplyAclWorkflowOperationHandler.java
C modules/matterhorn-conductor/src/main/resources/OSGI-INF/operations/apply-acl.xml
C modules/matterhorn-conductor/src/main/resources/ui/operation/trim/index.html
CU modules/matterhorn-conductor/src/main/resources/ui/operation/caption/index.html
C modules/matterhorn-conductor/pom.xml
C modules/matterhorn-authorization-xacml/src/main/java/org/opencastproject/authorization/xacml/XACMLAuthorizationService.java
C modules/matterhorn-userdirectory-jpa/src/main/java/org/opencastproject/userdirectory/jpa/JpaUserAndRoleProvider.java
C modules/matterhorn-userdirectory-jpa/src/main/java/org/opencastproject/userdirectory/jpa/JpaRoleMapping.java
C modules/matterhorn-common/src/main/java/org/opencastproject/security/api/CachingUserProviderMXBean.java
C modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowServiceImpl.java
C modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/JobJpaImpl.java
C docs/scripts/ddl/postgres84.sql
C docs/scripts/ddl/mysql5.sql
C docs/felix/conf/factories/org.opencastproject.userdirectory.ldap.LdapUserProvider.properties
C docs/felix/conf/system.properties
C docs/felix/conf/services/org.opencastproject.userdirectory.ldap.LdapUserProvider.properties
C docs/felix/conf/encoding/epiphan-split.properties
C docs/felix/conf/workflows/compose-distribute-publish.xml
C docs/scripts/ddl/README.txt
C .

Micah:
C shared-resources/player/engage-hybrid-player/player-multi-hybrid-initialize.js
C shared-resources/js/watch.js
C shared-resources/js/embed.js
C modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/endpoint/SchedulerRestService.java
C modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/endpoint/SchedulerRestService.java

Steps to reproduce

None

Status

Assignee

Christopher Brooks

Reporter

Christopher Brooks

Criticality

None

Tags (folksonomy)

None

Fix versions

Affects versions

1.3

Priority

Blocker