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.

Sign up for GitHub

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

Jump to bottom

Include language dependencies in build all of the time #168

Merged
merged 1 commit into from
May 1, 2020
Merged

Include language dependencies in build all of the time #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions installer/home/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@
<type>tar.gz</type>
</dependency>
<!-- Dependency for multilingual support -->
<!-- dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-languages-home</artifactId>
<version>[2.0.0,2.1.0)</version>
<artifactId>vivo-languages-home-core</artifactId>
<version>${project.version}</version>
<type>tar.gz</type>
</dependency -->
</dependency>
</dependencies>
</project>
20 changes: 10 additions & 10 deletions installer/webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@
<type>war</type>
</overlay>
<!-- Overlays for multilingual support -->
<!-- overlay>
<overlay>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-languages-webapp</artifactId>
<artifactId>vitro-languages-webapp-core</artifactId>
<type>war</type>
</overlay>
<overlay>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-languages-webapp</artifactId>
<artifactId>vivo-languages-webapp-core</artifactId>
<type>war</type>
</overlay -->
</overlay>
</overlays>
<webResources>
<resource>
Expand Down Expand Up @@ -153,18 +153,18 @@
<type>war</type>
</dependency>
<!-- Dependencies for multilingual support -->
<!-- dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-languages-webapp</artifactId>
<version>[2.0.0,2.1.0)</version>
<artifactId>vitro-languages-webapp-core</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-languages-webapp</artifactId>
<version>[2.0.0,2.1.0)</version>
<artifactId>vivo-languages-webapp-core</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency -->
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
Expand Down
6 changes: 3 additions & 3 deletions webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup

edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup

# For multiple language support
edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup

edu.cornell.mannlib.vitro.webapp.servlet.setup.ConfigurationModelsSetup
edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup

Expand Down Expand Up @@ -67,9 +70,6 @@ org.vivoweb.webapp.startup.SearchResultTemplateModelSetup

edu.ucsf.vitro.opensocial.OpenSocialSmokeTests

# For multiple language support
edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup

# The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper
# and the PermissionRegistry must already be set up.
edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerSetup
Expand Down