Skip to content

Commit

Permalink
Merge pull request #63 from zhx828/hotfix
Browse files Browse the repository at this point in the history 
Publish CancerHotspots in GitHub as maven repository
  • Loading branch information
@zhx828
zhx828 committed Mar 29, 2017
2 parents 1836c47 + 06274b8 commit 2918ce7
Show file tree
Hide file tree
Showing 7 changed files with 186 additions and 24 deletions.
90 changes: 84 additions & 6 deletions model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,99 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>master</artifactId>
<groupId>org.cmo.cancerhotspots</groupId>
<version>0.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Cancer Hotspots Model</name>
<description>Cancer Hotspots Model Module</description>

<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>model</artifactId>
<packaging>jar</packaging>
<version>0.1.2</version>

<url>https://github.com/cBioPortal/cancerhotspots/tree/master</url>

<properties>
<java.version>1.7</java.version>
<github.global.server>github</github.global.server>
</properties>

<build>
<finalName>model</finalName>

<plugins>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<configuration>
<message>Creating site for ${project.version}</message>
<repositoryName>cancerhotspots</repositoryName>
<repositoryOwner>cBioPortal</repositoryOwner>
<noJekyll>true</noJekyll>
<includes><include>**/*</include></includes>
<merge>true</merge>
<branch>refs/heads/mvn-repo</branch>
<outputDirectory>${project.build.directory}/mvn-repo</outputDirectory>
<server>github</server>
</configuration>
<executions>
<execution>
<goals>
<goal>site</goal>
</goals>
<phase>deploy</phase>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
</configuration>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>

<distributionManagement>
<repository>
<id>internal.repo</id>
<name>Temporary Staging Repository</name>
<url>file://${project.build.directory}/mvn-repo</url>
</repository>
</distributionManagement>

<dependencies>
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>util</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>com.univocity</groupId>
Expand Down
6 changes: 3 additions & 3 deletions persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>master</artifactId>
<groupId>org.cmo.cancerhotspots</groupId>
<version>0.1.0</version>
<version>0.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Cancer Hotspots Persistence</name>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>model</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>com.univocity</groupId>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>util</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pipeline/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>master</artifactId>
<groupId>org.cmo.cancerhotspots</groupId>
<version>0.1.0</version>
<version>0.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Cancer Hotspots Pipeline</name>
Expand Down Expand Up @@ -40,12 +40,12 @@
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>model</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>service</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>master</artifactId>
<packaging>pom</packaging>
<name>Cancer Hotspots</name>
<version>0.1.0</version>
<version>0.1.2</version>
<description>master maven module</description>
<url>https://github.com/cBioPortal/cancerhotspots/</url>

Expand Down
8 changes: 4 additions & 4 deletions service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>master</artifactId>
<groupId>org.cmo.cancerhotspots</groupId>
<version>0.1.0</version>
<version>0.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Cancer Hotspots Service</name>
Expand All @@ -16,17 +16,17 @@
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>model</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>util</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>persistence</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
90 changes: 87 additions & 3 deletions util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,98 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>master</artifactId>
<groupId>org.cmo.cancerhotspots</groupId>
<version>0.1.0</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.3.RELEASE</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<name>Cancer Hotspots Util</name>
<description>Cancer Hotspots Utility Module</description>

<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>util</artifactId>
<packaging>jar</packaging>
<version>0.1.2</version>

<url>https://github.com/cBioPortal/cancerhotspots/tree/master</url>

<properties>
<java.version>1.7</java.version>
<github.global.server>github</github.global.server>
</properties>

<build>
<finalName>util</finalName>

<plugins>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<configuration>
<message>Creating site for ${project.version}</message>
<repositoryName>cancerhotspots</repositoryName>
<repositoryOwner>cBioPortal</repositoryOwner>
<noJekyll>true</noJekyll>
<includes><include>**/*</include></includes>
<merge>true</merge>
<branch>refs/heads/mvn-repo</branch>
<outputDirectory>${project.build.directory}/mvn-repo</outputDirectory>
<server>github</server>
</configuration>
<executions>
<execution>
<goals>
<goal>site</goal>
</goals>
<phase>deploy</phase>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
</configuration>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>

<distributionManagement>
<repository>
<id>internal.repo</id>
<name>Temporary Staging Repository</name>
<url>file://${project.build.directory}/mvn-repo</url>
</repository>
</distributionManagement>

<dependencies>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<name>Cancer Hotspots Web</name>
<description>Cancer Hotspots Web Module</description>
<artifactId>webapp</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
<!--<packaging>jar</packaging>-->
<packaging>${packaging.type}</packaging>

<parent>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>master</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</parent>

<properties>
Expand Down Expand Up @@ -179,12 +179,12 @@
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>model</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>org.cmo.cancerhotspots</groupId>
<artifactId>service</artifactId>
<version>0.1.0</version>
<version>0.1.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down

0 comments on commit 2918ce7

Please sign in to comment.