Merge branch 'release-2.0.6'

Author: tschaka1904

pom.xml

@@ -8,39 +8,60 @@
         <version>4</version>
     </parent>
 
-    <groupId>psidev.psi.tools</groupId>
     <artifactId>validator</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.6</version>
 
     <name>PSI :: Tools :: Generic Schema Validator</name>
     <description>
         The library intends to provide a generic framework for validating XML Schema both at the syntactic and semantic level.
     </description>
 
     <scm>
-        <connection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/validator/trunk</connection>
-        <developerConnection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/validator/trunk</developerConnection>
-        <url>https://svn.code.sf.net/p/psidev/svn/psi/tools/validator/trunk</url>
+        <connection>scm:git:https://github.com/MICommunity/psi-validator.git</connection>
+        <developerConnection>scm:git:https://github.com/MICommunity/psi-validator.git</developerConnection>
+        <url>https://github.com/MICommunity/psi-validator</url>
+        <tag>HEAD</tag>
     </scm>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>external.atlassian.jgitflow</groupId>
+                <artifactId>jgitflow-maven-plugin</artifactId>
+                <version>1.0-m5.1</version>
+                <configuration>
+                        <flowInitContext>
+                            <masterBranchName>master</masterBranchName>
+                            <developBranchName>develop</developBranchName>
+                            <featureBranchPrefix>feature-</featureBranchPrefix>
+                            <releaseBranchPrefix>release-</releaseBranchPrefix>
+                            <hotfixBranchPrefix>hotfix-</hotfixBranchPrefix>
+                            <versionTagPrefix>${project.artifactId}-</versionTagPrefix>
+                        </flowInitContext>
+                    <!-- see goals wiki page for configuration options -->
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>psidev.psi.tools</groupId>
             <artifactId>cv-rule-reader</artifactId>
-            <version>2.0.6-SNAPSHOT</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>psidev.psi.tools</groupId>
             <artifactId>object-rule-reader</artifactId>
-            <version>2.0.6-SNAPSHOT</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>psidev.psi.tools</groupId>
             <artifactId>ontology-manager</artifactId>
-            <version>2.0.6-SNAPSHOT</version>
+            <version>2.0.6</version>
         </dependency>
 
         <!-- Tests -->
@@ -76,10 +97,34 @@
 
     <repositories>
         <repository>
-            <id>intact.nexus</id>
-            <name>IntAct Nexus</name>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public/</url>
+            <id>nexus-ebi-repo-old</id>
+            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo/</url>
+        </repository>
+        <repository>
+            <id>nexus-ebi-release-repo</id>
+            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-repo/</url>
+        </repository>
+        <repository>
+            <id>nexus-ebi-snapshot-repo</id>
+            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-snapshots/</url>
         </repository>
     </repositories>
+
+    <!-- Overwrites the previous 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>
+            <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>