Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master who merged #62

Merged
merged 30 commits into from
Sep 11, 2024
Merged

Master who merged #62

merged 30 commits into from
Sep 11, 2024

Conversation

alexsilaghi
Copy link
Collaborator

No description provided.

matthewhorridge and others added 30 commits July 30, 2024 11:22
This change is necessary because the spotify docker plugin does not work on Apple Silicon and the plugin itself is no longer maintained.
Replace spotify docker plugin with maven-exec plugin
Apply correct property name for source
Allow non-prefixed names for types
# Conflicts:
#	pom.xml
#	webprotege-gwt-ui-client/pom.xml
#	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/inject/ClientProjectModule.java
#	webprotege-gwt-ui-server-core/pom.xml
#	webprotege-gwt-ui-server-core/src/main/java/edu/stanford/bmir/protege/web/server/form/FormControlValueDeserializer.java
#	webprotege-gwt-ui-server/pom.xml
#	webprotege-gwt-ui-shared-core/pom.xml
#	webprotege-gwt-ui-shared/pom.xml
@alexsilaghi alexsilaghi merged commit bd0612f into master-who Sep 11, 2024
1 check passed
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.

2 participants