Skip to content

Commit

Permalink
Merge branch 'develop' into develop_causal
Browse files Browse the repository at this point in the history
  • Loading branch information
@bblodfon
bblodfon authored Jul 17, 2018
2 parents 2369338 + 905aa68 commit 772ea6a
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 45 deletions.
56 changes: 21 additions & 35 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,7 @@
<psimi.version>${project.version}</psimi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jami.version>1.0.1-SNAPSHOT</jami.version>
<jami.commons.version>1.1.3-SNAPSHOT</jami.commons.version>
<jami.core.version>1.2.2-SNAPSHOT</jami.core.version>
<jami.xml.version>1.1.3-SNAPSHOT</jami.xml.version>
<jami.mitab.version>1.1.2-SNAPSHOT</jami.mitab.version>
<jami.batch.version>1.1.1-SNAPSHOT</jami.batch.version>
<jami.bridges.version>1.1.2-SNAPSHOT</jami.bridges.version>
<jami.crosslink.version>1.1.1-SNAPSHOT</jami.crosslink.version>
<jami.enricher.version>1.1.2-SNAPSHOT</jami.enricher.version>
<jami.examples.version>1.1.2-SNAPSHOT</jami.examples.version>
<jami.html.version>1.1.2-SNAPSHOT</jami.html.version>
<jami.interactionViewer.version>2.0.2-SNAPSHOT</jami.interactionViewer.version>
<jami.imex.version>1.1.2-SNAPSHOT</jami.imex.version>
<jami.version>3.0.12</jami.version>
<calimocho.version>2.5.2-SNAPSHOT</calimocho.version>
<validator.version>3.0.2-SNAPSHOT</validator.version>
</properties>
Expand Down Expand Up @@ -182,23 +170,6 @@
</plugins>
</build>

<repositories>
<repository>
<id>intact.nexus</id>
<name>IntAct Nexus</name>
<url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public</url>
</repository>
</repositories>


<pluginRepositories>
<pluginRepository>
<id>intact.nexus</id>
<name>IntAct Nexus</name>
<url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public</url>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand All @@ -208,15 +179,30 @@
</dependency>
</dependencies>

<distributionManagement>
<repositories>
<repository>
<id>nexus-ebi-release-repo</id>
<url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-repo/</url>
</repository>
<repository>
<id>ebi-repo</id>
<url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo</url>
<id>nexus-ebi-snapshot-repo</id>
<url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-snapshots/</url>
</repository>
</repositories>

<distributionManagement>
<!-- EBI repo -->
<repository>
<id>pst-release</id>
<name>EBI Nexus Repository</name>
<url>http://www.ebi.ac.uk/Tools/maven/repos/content/repositories/pst-release</url>
</repository>
<!-- EBI SNAPSHOT repo -->
<snapshotRepository>
<id>ebi-repo-snapshots</id>
<url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo-snapshots</url>
<uniqueVersion>false</uniqueVersion>
<id>pst-snapshots</id>
<name>EBI Nexus Snapshots Repository</name>
<url>http://www.ebi.ac.uk/Tools/maven/repos/content/repositories/pst-snapshots</url>
</snapshotRepository>
</distributionManagement>
</project>
20 changes: 10 additions & 10 deletions psimi-enricher/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>psimi-master</artifactId>
<version>1.8.6-SNAPSHOT</version>
</parent>
<groupId>psidev.psi.mi</groupId>

<artifactId>psimi-enricher</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>PSI :: Enricher</name>
Expand Down Expand Up @@ -155,14 +155,14 @@
<dependency>
<groupId>psidev.psi.mi.jami</groupId>
<artifactId>jami-enricher</artifactId>
<version>${jami.enricher.version}</version>
<version>${jami.version}</version>
</dependency>

<!-- Fetchers -->
<dependency>
<groupId>psidev.psi.mi.jami.bridges</groupId>
<artifactId>jami-uniprot</artifactId>
<version>${jami.bridges.version}</version>
<version>${jami.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
Expand All @@ -174,19 +174,19 @@
<dependency>
<groupId>psidev.psi.mi.jami.bridges</groupId>
<artifactId>jami-uniprot-taxonomy</artifactId>
<version>${jami.bridges.version}</version>
<version>${jami.version}</version>
</dependency>

<dependency>
<groupId>psidev.psi.mi.jami.bridges</groupId>
<artifactId>jami-chebi</artifactId>
<version>${jami.bridges.version}</version>
<version>${jami.version}</version>
</dependency>

<dependency>
<groupId>psidev.psi.mi.jami.bridges</groupId>
<artifactId>uniprot-mapping</artifactId>
<version>${jami.bridges.version}</version>
<version>${jami.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
Expand All @@ -206,19 +206,19 @@
<dependency>
<groupId>psidev.psi.mi.jami.bridges</groupId>
<artifactId>jami-europubmedcentral</artifactId>
<version>${jami.bridges.version}</version>
<version>${jami.version}</version>
</dependency>

<dependency>
<groupId>psidev.psi.mi.jami.bridges</groupId>
<artifactId>jami-ols</artifactId>
<version>${jami.bridges.version}</version>
<version>${jami.version}</version>
</dependency>

<dependency>
<groupId>psidev.psi.mi.jami</groupId>
<artifactId>jami-commons</artifactId>
<version>${jami.commons.version}</version>
<version>${jami.version}</version>
</dependency>

<!-- slf4j -->
Expand All @@ -236,7 +236,7 @@
<dependency>
<groupId>psidev.psi.mi.jami</groupId>
<artifactId>jami-batch</artifactId>
<version>${jami.batch.version}</version>
<version>${jami.version}</version>
</dependency>

</dependencies>
Expand Down

0 comments on commit 772ea6a

Please sign in to comment.