Skip to content

Commit

Permalink
Merge branch 'main' into 1931-pagination_embargo_graduation
Browse files Browse the repository at this point in the history
  • Loading branch information
kaladay authored May 9, 2024
2 parents 61f002d + 4813dde commit 731a685
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ $ mvn clean spring-boot:run -Dproduction
$ mvn clean package -DskipTests -Dproduction -Dassets.uri=file:/opt/vireo/ -Dconfig.uri=file:/opt/vireo/config/
```

If build succeeds, you should have both a `vireo-4.2.6.war` and a `vireo-4.2.6-install.zip` in the `target/` directory. When building for production required static assets are copied into the packaged war file and the index.html template is optimized for production. For development a symlink is used to allow the application to access required static assets.
If build succeeds, you should have both a `vireo-4.2.7.war` and a `vireo-4.2.7-install.zip` in the `target/` directory. When building for production required static assets are copied into the packaged war file and the index.html template is optimized for production. For development a symlink is used to allow the application to access required static assets.

#### Apache Reverse Proxy Config

Expand Down Expand Up @@ -117,7 +117,7 @@ Unzip package into preferred directory (or any directory you choose):

```bash
$ cd /opt/vireo
$ unzip vireo-4.2.6-install.zip
$ unzip vireo-4.2.7-install.zip
```

### Directory Structure of installed package
Expand Down Expand Up @@ -190,13 +190,13 @@ ln -s /opt/vireo/webapp /opt/tomcat/webapps/ROOT
Copy war file into Tomcat webapps directory (your location may vary -- this is an example):

```bash
$ cp ~/vireo-4.2.6.war /usr/local/tomcat/webapps/vireo.war
$ cp ~/vireo-4.2.7.war /usr/local/tomcat/webapps/vireo.war
```

or as root:

```bash
$ cp ~/vireo-4.2.6.war /usr/local/tomcat/webapps/ROOT.war
$ cp ~/vireo-4.2.7.war /usr/local/tomcat/webapps/ROOT.war
```

**if not specifying assets.uri during build the assets will be stored under the vireo webapp's classpath, /opt/tomcat/webapps/vireo/WEB-INF/classes**
Expand All @@ -209,7 +209,7 @@ $ cp ~/vireo-4.2.6.war /usr/local/tomcat/webapps/ROOT.war
## Running WAR as a stand-alone Spring Boot application

```bash
java -jar target/vireo-4.2.6.war
java -jar target/vireo-4.2.7.war
```

<div align="right">(<a href="#readme-top">back to top</a>)</div>
Expand Down
2 changes: 1 addition & 1 deletion build/appConfig.js.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var appConfig = {

'version': '4.2.6',
'version': '4.2.7',

'allowAnonymous': true,
'anonymousRole': 'ROLE_ANONYMOUS',
Expand Down
2 changes: 1 addition & 1 deletion example.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
##############################

IMAGE_HOST=127.0.0.1
IMAGE_VERSION=4.2.6
IMAGE_VERSION=4.2.7
SERVICE_PROJECT=tdl
SERVICE_PATH=vireo

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vireo",
"private": false,
"version": "4.2.6",
"version": "4.2.7",
"description": "Vireo 4",
"homepage": "https://github.com/TexasDigitalLibrary/Vireo",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.tdl</groupId>
<artifactId>vireo</artifactId>
<version>4.2.6</version>
<version>4.2.7</version>

<name>Vireo</name>
<description>Vireo Thesis and Dissertation Submission System</description>
Expand Down

0 comments on commit 731a685

Please sign in to comment.