Skip to content

feature/1263-jakartaMigration - #1264

Open
petrpodsed wants to merge 32 commits into
masterfrom
feature/1263-jakartaMigration
Open

petrpodsed wants to merge 32 commits into
masterfrom
feature/1263-jakartaMigration

Conversation

@petrpodsed

Copy link
Copy Markdown
Contributor

No description provided.

…aMigration

# Conflicts:
#	rest/src/main/java/cz/incad/kramerius/rest/api/guice/ApiServletModule.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/admin/v70/sync/SDNNTSyncResource.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/cdk/v70/CDKForwardResource.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/ItemsResource.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/cdk/ClientUserResource.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/cdk/ItemsResource.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/redirection/ProxyHandlerSupport.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/redirection/item/ProxyItemHandler.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/redirection/item/V7ForwardHandler.java
#	search/src/java/cz/incad/Kramerius/imaging/utils/CDKIIIFServletUtils.java
#	security/authfilters/src/main/java/cz/incad/kramerius/auth/thirdparty/shibb/utils/CDKShibbolethForwardUtils.java
#	shared/common/src/main/java/cz/inovatika/http/clients/ApacheHTTPSolrClientProvider.java
…aMigration

# Conflicts:
#	rest/src/main/java/cz/incad/kramerius/rest/api/guice/ApiServletModule.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/cdk/v70/CDKForwardResource.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/cdk/ItemsResource.java
#	rest/src/main/java/cz/incad/kramerius/rest/apiNew/client/v70/redirection/item/V7ForwardHandler.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant