Simplify dependency management

This commit is contained in:
Graham Triggs 2016-06-24 20:28:26 +01:00
parent a292213817
commit 275f6f335b
7 changed files with 44 additions and 6 deletions

View file

@ -27,7 +27,6 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-dependencies</artifactId> <artifactId>vitro-dependencies</artifactId>
<version>1.9.0-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>

View file

@ -70,7 +70,6 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-home</artifactId> <artifactId>vitro-home</artifactId>
<version>1.9.0-SNAPSHOT</version>
<type>tar.gz</type> <type>tar.gz</type>
</dependency> </dependency>
</dependencies> </dependencies>

View file

@ -109,7 +109,6 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vivo-home</artifactId> <artifactId>vivo-home</artifactId>
<version>1.9.0-SNAPSHOT</version>
<type>tar.gz</type> <type>tar.gz</type>
</dependency> </dependency>
</dependencies> </dependencies>

View file

@ -22,6 +22,10 @@
<name>VIVO Installer</name> <name>VIVO Installer</name>
<properties>
<vitro-version>${project.version}</vitro-version>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -47,6 +51,34 @@
<module>webapp</module> <module>webapp</module>
</modules> </modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-solr</artifactId>
<version>${vitro-version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-home</artifactId>
<version>${vitro-version}</version>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-api</artifactId>
<version>${vitro-version}</version>
</dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-webapp</artifactId>
<version>${vitro-version}</version>
<type>war</type>
</dependency>
</dependencies>
</dependencyManagement>
<profiles> <profiles>
<profile> <profile>
<id>skip-install</id> <id>skip-install</id>

View file

@ -128,7 +128,6 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-solr</artifactId> <artifactId>vitro-solr</artifactId>
<version>1.9.0-SNAPSHOT</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
</dependencies> </dependencies>

View file

@ -129,12 +129,10 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vivo-api</artifactId> <artifactId>vivo-api</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vivo-webapp</artifactId> <artifactId>vivo-webapp</artifactId>
<version>1.9.0-SNAPSHOT</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
</dependencies> </dependencies>

12
pom.xml
View file

@ -206,6 +206,18 @@
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-dependencies</artifactId>
<version>${vitro-version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-home</artifactId>
<version>${vitro-version}</version>
<type>tar.gz</type>
</dependency>
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-webapp</artifactId> <artifactId>vitro-webapp</artifactId>