Commit graph

66 commits

Author SHA1 Message Date
Ralph O'Flinn
abd40c25f5
updates to outdated URLs and branch names (#251) (#252)
updates to outdated URLs and branch names (typically master -> main)
2021-10-06 06:38:19 -05:00
Ralph O'Flinn
584b34c682 [maven-scm-plugin] prepare development vivo-1.12.1-SNAPSHOT-SNAPSHOT 2021-06-23 00:19:07 -05:00
Ralph O'Flinn
9b0de5f3d4 [maven-scm-plugin] prepare release vivo-1.12.0 2021-06-23 00:16:40 -05:00
Brian Lowe
09e4ea732a
Add self-activating profiles for building Vitro-languages and VIVO-l… (#245)
* Add self-activating profiles for compiling Vitro-languages and VIVO-languages in place of i18n profile

* Remove trailing whitespace
2021-06-22 13:48:05 -05:00
Brian Lowe
109b5a4fe1
Update version numbers in pom.xmls (#244)
* Update version numbers in pom.xmls

* Restore -SNAPSHOT
2021-06-21 04:11:24 -05:00
Michel Héon
e3027841aa
integrate in a single Maven call the compilation and installation of (#242)
Integrate in a single Maven call the compilation and installation of VIVO-Languages and Vitro-Languages in VIVO.
2021-06-04 17:17:17 +03:00
Ralph O'Flinn
d00d7de585
Revert deployment strategy (#230)
* revert deployment changes

* update docker and compose for previous deployment

* minor readme update

* use package instead of install

this avoids exploding war file in tomcat but seems to be missing overlays for VIVO theme

* test docker workflow

* test deploy workflow

* add package profile for home

* skip deploy for installer

* skip installer by profile

* update workflows

* minor readme update

* use app-name for vivo log file name

* Update log4j.properties

Co-authored-by: William Welling <wwelling@library.tamu.edu>
2021-03-24 01:46:24 -05:00
Andrew Woods
268ffa1cd7
Sprint i18n with main (#215)
* Layer uqam updates onto master (minus trailing whitespace)

* Update AddOrganizerRoleToPersonGenerator.java

Removed extraneous whitespace

* My whitespace (#153)

* Update AddPublicationToPersonGenerator.java

* Removed extraneous whitespace AND move RootUserPolicy.java from VIVO to Vitro

* Fixed whitespace in: AddAttendeeRoleToPersonGenerator.java

* Fixed indentations for AddOutreachProviderRoleToPersonGenerator.java

* Fixed indentations

* Removed extraneous whitespace (#158)

* Removed extraneous whitespace

* Fix bug introduced in cleaning up whitespace

* Tagging UQAM comments with the following tags

-Add-Feature
-Optimization
-Linguistic-Management
-Bug-Correction

* Update AddReviewerRoleToPersonGenerator.java

* Added an internationalization correction to be considered in the vivo-i18n-core that was forgotten when sprint-i18n was created.

* Fix typo in AddReviewerRoleToPersonGenerator

Resolves: https://jira.lyrasis.org/browse/VIVO-1774

* Fix typo in AddOutreachProviderRoleToPersonGenerator

Resolves: https://jira.lyrasis.org/browse/VIVO-1775

* Include language dependencies in build all of the time (#168)

Move "LocaleSelectionSetup" higher in the startup list so that the Vitro:RDFFilesLoader has the locale info available on its startup

Part of resolution to: https://jira.lyrasis.org/browse/VIVO-1836

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Made modifications to publicationToPersonUtils.js so that multilangua… (#170)

* Made modifications to publicationToPersonUtils.js so that multilanguage support will not break the javascript functionalty.

Co-authored-by: root <root@vivo-development.hs-mittweida.de>

Resolves: https://jira.lyrasis.org/browse/VIVO-1739

* Feature language en_CA (#169)

* Changing ontology extensions for n3 & assigning a base IRI to each
ontology

Co-authored-by: michelheonuqam <heon.michel@uqam.ca>
Co-authored-by: michelheon <heon@videotorn.ca>

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1862

* i18n: title tag and headings in capability map are in english in french version (#173)

* added multi-language support for ticket VIVO-1846

* fixed swapped properties, added Capability map title to i18n

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1847

* Added i18n support for Capability Map control buttons, JIRA ticket VIVO-1846

* removed redundat files which are now available via Vitro- and VIVO-languages

* added i18n support for the capability map, ticket vivo-1892

* Revert non-function RDF changes (#180)

Related to: https://jira.lyrasis.org/browse/VIVO-1905

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Ensure 'other' in Individual->Teaching->advisees->type is translated

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1881

* [VIVO-1842] i18n: Added function js_string at i18n variables to handle quotes properly (#181)

* added js_string at i18n strings to handle quotes properly, ticket vivo-1842

Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1842

* replace static headings with i18n values (#183)

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1844

* added empty check for getCountry, fixing bug with spanish label (es), ticket vivo-1900 (#182)

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1900

* Issue/vivo 1908 (#185)

* Provide fallback language in language-filtered webpage SPARQL query and use existing RDFService-based filtering for ConstantFieldOptions

Resolves: https://jira.lyrasis.org/browse/VIVO-1906

* Fix bug of missing toString() (#187)

Related to: https://jira.lyrasis.org/browse/VIVO-1906

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Remove files replicated in i18n (#186)

Related to: https://jira.lyrasis.org/browse/VIVO-1917

* removed redundant vitroAnnotations, now in VIVO-languages, ticket vivo-1821

* Removed key.png from the template and replaced it with css sprite and… (#184)

* Removed key.png from the template and replaced it with css sprite and descriptions in plain text.
* * adding height to background images, hopefully fixing issues

Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1902

* [VIVO-1915] i18n - removing language select for label management for individuals (#190)

* removed the language select for managing multi language labels fpr individuals, ticket vivo-1915

* modified ManageLabelsForPersonGenerator so that you can only add an langauge label if it is not already set, ticket vivo-1915

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1915

* - added i18n() to hardcoded values

* added i18n support to person's domain in capability map, ticket 1867

* [VIVO-1946] - Update ResearcherID description in vivo.owl (#188)

* Update ResearcherID description in vivo.owl

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1946

* [VIVO-1936] i18n: updated the language comment in runtime.properties (#203)

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1936

Co-authored-by: Kampe <Benjamin.Kampe@tib.eu>

* [VIVO-1924] i18n: @en i18n properties are not loaded during first site startup. (#204)

* rearranged startup-listeners fixing bug with language files, ticket VIVO-1924

* Added a comment to prevent future bugs like this, ticket VIVO-1924

* fixed previous comment, ticket VIVO-1924

* Remove duplicate text from dropdown menus

* Minor checkstyle correction following: VIVO-1936 (#206)

Follow-on to: https://jira.lyrasis.org/browse/VIVO-1936

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* follow-up on vivo-1936 - restore default values in example-settings.xml (#210)

Co-authored-by: gneissone <mbgross@wustl.edu>

* [VIVO-1798] - Internationalize first and last name validation (#207)

* Internationalize first and last name validation

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1798

* adding collections process terms (#165)

* adding collections process terms

No JIRA :(

* Non-functional change to comment in example.applicationSetup.n3

Related to: https://jira.lyrasis.org/browse/VIVO-1741

* Update orcidConfirm.ftl (#199)

Fix i18n property used on ORCID confirmation step 2 button.
Related to https://jira.lyrasis.org/browse/VIVO-1945

* Fix external AGROVOC service URL

* URL fix for LCSH service

* Remove unnecessary pom.xml 'profile'

- Also, uncomment language overlays
   - Noting that this is not actually necessary, as any 'war' Maven dependencies are automatically overlayed:
   - https://maven.apache.org/plugins/maven-war-plugin/overlays.html

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: Nicolas D <46490666+nicalico@users.noreply.github.com>
Co-authored-by: UQAM-VIVO <heon.michel@uqam.ca>
Co-authored-by: matthiasluehr <60263380+matthiasluehr@users.noreply.github.com>
Co-authored-by: Michel Heon <heon@videotron.ca>
Co-authored-by: dofeldsc <dofeldsc@uos.de>
Co-authored-by: William Welling <wwelling@library.tamu.edu>
Co-authored-by: Brian Lowe <brianjlowe@gmail.com>
Co-authored-by: Matthias Lühr <luehr@hs-mittweida.de>
Co-authored-by: Ben <mbgross@wustl.edu>
Co-authored-by: Benjamin Kampe <benjamin@fehrmanns.net>
Co-authored-by: Kampe <Benjamin.Kampe@tib.eu>
Co-authored-by: Gross, Benjamin <benjamin.gross@clarivate.com>
Co-authored-by: diatomsRcool <annethessen@gmail.com>
Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com>
2021-02-10 11:02:20 -06:00
William Welling
f97972e5aa
VIVO-1960: GitHub Actions Continued (#218)
* add build workflow
* remove travis
* remove unnecessary vitro cache
* update readme badge
* run tests during CI build
* build CI use java 11
* add repositories to distribution management
* deploy from main branch and update readme

Follow-on to: https://jira.lyrasis.org/browse/VIVO-1960
2021-02-09 17:46:21 -05:00
Andrew Woods
01776ee692
Enable war deployment model (#197)
* Add 'home' files into build war artifact

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Disable copying exploded war to Tomcat dir

- hardcode vivo.all.log file name
- must now set system property: -Dvivo-dir=/opt/vivo/home/

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Ensure build does not remove and re-add VIVO_HOME/rdf

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Remove unnecessary profile from installer/pom.xml

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Rename example config files to have 'default' prefix

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Require common properties to be in JNDI

Properties include:
- vitro/home
- vitro/appName
- vitro/rootUserAddress
- vitro/defaultNamespace

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* VIVO-1443: app name (#2)

* Non-functional change to comment in example.applicationSetup.n3

Related to: https://jira.lyrasis.org/browse/VIVO-1741

* Update orcidConfirm.ftl (#199)

* remove example-settings.xml
* simplify war name and afford override during build
* default app name to vivo and pass into context.xml

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com>

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: William Welling <wwelling@library.tamu.edu>
Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com>
2021-02-05 10:56:50 -06:00
Ralph O'Flinn
96e9f507c5 [maven-scm-plugin] prepare development vivo-1.11.2-SNAPSHOT 2020-03-07 10:46:41 -06:00
Ralph O'Flinn
cad6a66f39 [maven-scm-plugin] prepare release vivo-1.11.1 2020-03-07 10:45:36 -06:00
Ralph O'Flinn
4b18675112 [maven-scm-plugin] prepare development vivo-1.11.1-SNAPSHOT 2019-10-21 04:38:26 -05:00
Ralph O'Flinn
f0d3a70fba [maven-scm-plugin] prepare release vivo-1.11.0 2019-10-21 04:35:52 -05:00
Ralph O'Flinn
92d0fe98c5 Merge branch 'sprint-search' into dev-search
# Conflicts:
#	installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
#	webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
2019-06-21 09:50:40 -05:00
Ben
87092cec9c [VIVO-1690] - Remove trailing whitespace throughout project (#126)
* Remove trailing whitespace throughout project

Resolves: https://jira.duraspace.org/browse/VIVO-1690
** Along with: https://github.com/vivo-project/Vitro/pull/117
2019-05-03 12:51:00 -04:00
Andrew Woods
adfbe22950 Remove embedded Solr
Related to: https://jira.duraspace.org/browse/VIVO-1592
2019-04-03 12:25:16 -04:00
gneissone
3da53e27fe Replace antrun-plugin <tasks> with <target> in pom.xml files 2019-01-14 17:27:32 -05:00
Graham Triggs
ebc75d184b [VIVO-1605] Update to latest Error Prone plugin and configuration to support JDK 11 (#89)
* Update to latest Error Prone plugin and configuration to support JDK 11

* Update Error Prone dependency from SNAPSHOT

* Add Javac version missing from Error Prone docs

Partial resolution of: https://jira.duraspace.org/browse/VIVO-1605
2018-10-25 12:52:08 -04:00
vivo-uab
0547725a48 [maven-scm-plugin] prepare development vivo-1.11.0-SNAPSHOT 2018-07-09 20:18:40 -04:00
vivo-uab
df0b4697a4 [maven-scm-plugin] prepare release vivo-1.10.0 2018-07-09 20:18:40 -04:00
Andrew Woods
02369012fc Allow retrieval of SNAPSHOT dependencies, in installer
With previous commit, resolves: https://jira.duraspace.org/browse/VIVO-1523
2018-07-09 20:18:40 -04:00
Graham Triggs
5ca0d3daff [VIVO-1470] Cross-platform improvements for Maven (#64) 2018-05-02 12:51:09 +03:00
Andrew Woods
5991c8411d Change project version from 2.0.0-SNAPSHOT to 1.10.0-SNAPSHOT
Resolves: https://jira.duraspace.org/browse/VIVO-1479
2018-04-24 17:09:56 -04:00
Graham Triggs
5af359a02b Fix building on JDK 9 2017-10-23 19:24:58 +01:00
Graham Triggs
9a40939076 Update language pack example 2017-10-21 22:31:05 +01:00
Graham Triggs
fa311788fe Update project version numbers 2017-10-20 15:02:41 +01:00
Graham Triggs
b4fa30e7a5 Sections needed for internationalization 2017-10-07 20:30:16 +01:00
Graham Triggs
870bc529e6 Consolidate local overrides of messages and styles in "local" subdirectory. Allows customisation without creating a new thmee. 2017-10-02 18:24:06 +01:00
Graham Triggs
b345aa9359 Initial work for Maven site generation 2017-09-16 23:20:44 +01:00
Graham Triggs
2f45fc7178 Update versions for beta 2 release 2017-07-27 17:39:43 +01:00
Graham Triggs
5bcdd34c92 Reset develop to SNAPSHOT release 2017-06-12 21:54:13 +01:00
Graham Triggs
deefe90f39 Beta version 2017-06-09 15:57:45 +01:00
Nate Prewitt
34afa4e43b
updating license path 2017-04-21 17:12:47 -06:00
Jim Blake
21a1df1c3a VIVO-1258 derive location of log files from CATALINA_BASE instead of CATALINA_HOME (#51) 2017-04-05 09:14:39 -04:00
Graham Triggs
b83d4101a2 Update POM to require Java 8 (Jena 3.x does not support earlier versions) 2016-12-21 14:12:48 +00:00
Graham Triggs
06200d37ec Update commons-lang to 3.4 (same as used by Jena 3.1.1) 2016-12-17 20:11:03 +00:00
Graham Triggs
03550cc220 Update version numbers 2016-10-31 19:47:04 +00:00
Graham Triggs
1865b525b8 [VIVO-1270] Initial commit of Jena 3 2016-09-02 19:59:21 +01:00
Graham Triggs
3febf44765 [VIVO-1268] Add UTF-8 settings to Java compiler 2016-08-26 16:16:16 +01:00
Graham Triggs
8894d19ccf [VIVO-1269] Add compiler settings to the installer 2016-08-26 16:10:19 +01:00
Graham Triggs
83c3b9469a Add clean plugin version 2016-07-18 19:27:34 +01:00
Graham Triggs
7f6f9ba264 Add dependencies to webapp pom.xml 2016-07-14 22:47:43 +01:00
Graham Triggs
5ea1c833e4 Rename default-settings.xml to example-settings.xml 2016-07-07 10:10:30 +01:00
Graham Triggs
376f15e1eb [VIVO-1082] Clean up pluginManagement 2016-07-06 06:38:45 +01:00
Graham Triggs
58524b5f8a [VIVO-1082] Cleanup of VIVO poms 2016-07-06 06:19:51 +01:00
Graham Triggs
3cfe8745a5 Remove unnecessary config from pom.xml 2016-07-04 15:00:37 +01:00
Graham Triggs
b434285fa9 Clean overlays from web apps 2016-06-26 15:45:16 +01:00
Graham Triggs
5123620051 Add GPG version 2016-06-26 15:36:39 +01:00
Graham Triggs
fac3f75f45 Skip staging plugin 2016-06-24 20:57:50 +01:00