litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'heads/rel-1.12.1-RC' into main

Browse source
This commit is contained in:
Ralph O'Flinn 2021-12-16 05:11:28 -06:00
commit 4d24a63a20
9 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -27,3 +27,5 @@ utilities/sdb_to_tdb/.work
.fake .fake
.ionide .ionide
.vscode

6
api/pom.xml
View file

@ -7,13 +7,13 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-api</artifactId> <artifactId>vitro-api</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-project</artifactId> <artifactId>vitro-project</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
@ -73,7 +73,7 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-dependencies</artifactId> <artifactId>vitro-dependencies</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency> <dependency>

4
dependencies/pom.xml vendored
View file

@ -7,13 +7,13 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-dependencies</artifactId> <artifactId>vitro-dependencies</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-project</artifactId> <artifactId>vitro-project</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

4
home/pom.xml
View file

@ -7,13 +7,13 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-home</artifactId> <artifactId>vitro-home</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-project</artifactId> <artifactId>vitro-project</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

4
installer/home/pom.xml
View file

@ -7,13 +7,13 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-installer-home</artifactId> <artifactId>vitro-installer-home</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-installer</artifactId> <artifactId>vitro-installer</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

9
installer/pom.xml
View file

@ -7,16 +7,9 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-installer</artifactId> <artifactId>vitro-installer</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-project</artifactId>
<version>1.12.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<name>Vitro Installer</name> <name>Vitro Installer</name>
<properties> <properties>

6
installer/webapp/pom.xml
View file

@ -7,13 +7,13 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-installer-webapp</artifactId> <artifactId>vitro-installer-webapp</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<packaging>war</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-installer</artifactId> <artifactId>vitro-installer</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

6
pom.xml
View file

@ -7,7 +7,7 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-project</artifactId> <artifactId>vitro-project</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Vitro</name> <name>Vitro</name>
@ -187,7 +187,9 @@
<configuration> <configuration>
<serverId>ossrh</serverId> <serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl> <nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose> <autoReleaseAfterClose>false</autoReleaseAfterClose>
<keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
<stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

6
webapp/pom.xml
View file

@ -7,13 +7,13 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-webapp</artifactId> <artifactId>vitro-webapp</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<parent> <parent>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-project</artifactId> <artifactId>vitro-project</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
@ -41,7 +41,7 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-api</artifactId> <artifactId>vitro-api</artifactId>
<version>1.12.1-SNAPSHOT</version> <version>1.12.2-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>