Skip to content

Commit

Permalink
Merge branch 'release-2.0.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
@noedelta
noedelta committed Jul 27, 2016
2 parents 5514f0a + 2a34abd commit d5a18b6
Show file tree
Hide file tree
Showing 10 changed files with 194 additions and 386 deletions.
44 changes: 0 additions & 44 deletions cv-mapping-rules/pom.xml
View file

This file was deleted.

49 changes: 9 additions & 40 deletions cv-rule-reader/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
<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/maven-v4_0_0.xsd">

<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>psidev.psi.tools</groupId>
<artifactId>master-pom</artifactId>
<version>4</version>
<version>2.0.7</version>
</parent>

<groupId>psidev.psi.tools</groupId>
<artifactId>cv-rule-reader</artifactId>
<name>PSI :: Tools :: CV Rule Reader</name>
<packaging>jar</packaging>
<version>2.0.6-SNAPSHOT</version>

<name>PSI :: Tools :: CV Rule Reader</name>

<description>
The library provides a cv rule reader for the cv rule configuration XML file that is used with the validator.
</description>

<scm>
<connection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/cv-rule-reader/trunk</connection>
<developerConnection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/cv-rule-reader/trunk</developerConnection>
<url>http://svn.code.sf.net/p/psidev/svn/psi/tools/cv-rule-reader/trunk</url>
</scm>

<build>
<plugins>
<!-- Conversion of XML Schema into Java source code using JAXB-XJC -->
Expand All @@ -45,57 +36,35 @@
</execution>
</executions>
</plugin>

<!-- Assembly -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>${descriptor}</descriptor>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<!-- Tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>

<!-- 3rd party -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
</dependency>

<!-- JAXB related deps -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>

<!-- Tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>

<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>

</project>
63 changes: 16 additions & 47 deletions object-rule-reader/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,28 @@
<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/maven-v4_0_0.xsd">

<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>psidev.psi.tools</groupId>
<artifactId>master-pom</artifactId>
<version>4</version>
<version>2.0.7</version>
</parent>

<groupId>psidev.psi.tools</groupId>
<artifactId>object-rule-reader</artifactId>
<name>PSI :: Tools :: Object Rule Reader</name>
<packaging>jar</packaging>
<version>2.0.6-SNAPSHOT</version>

<name>PSI :: Tools :: Object Rule Reader</name>

<description>
The library provides an object rule configuration reader.
</description>

<scm>
<connection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/object-rule-reader/trunk</connection>
<developerConnection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/object-rule-reader/trunk</developerConnection>
<url>https://svn.code.sf.net/p/psidev/svn/psi/tools/object-rule-reader/trunk</url>
</scm>

<build>
<plugins>
<!-- Conversion of XML Schema into Java source code using JAXB-XJC -->
<plugin>
<groupId>com.sun.tools.xjc.maven2</groupId>
<artifactId>maven-jaxb-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<generatePackage>psidev.psi.tools.objectRuleReader.mapping.jaxb</generatePackage>
<includeSchemas>
Expand All @@ -47,58 +31,43 @@
<strict>true</strict>
<verbose>true</verbose>
</configuration>
</plugin>

<!-- Assembly -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>${descriptor}</descriptor>
</configuration>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<!-- Tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>

<!-- 3rd party -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
</dependency>

<!-- JAXB related deps -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>

<!-- Tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>

<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>

</project>
63 changes: 16 additions & 47 deletions ontology-config-reader/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,28 @@
<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/maven-v4_0_0.xsd">

<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>psidev.psi.tools</groupId>
<artifactId>master-pom</artifactId>
<version>4</version>
<version>2.0.7</version>
</parent>

<groupId>psidev.psi.tools</groupId>
<artifactId>ontology-config-reader</artifactId>
<name>PSI :: Tools :: Ontology Config Reader</name>
<packaging>jar</packaging>
<version>2.0.6-SNAPSHOT</version>

<name>PSI :: Tools :: Ontology Config Reader</name>

<description>
The library provides an ontology configuration reader.
</description>

<scm>
<connection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/ontology-config-reader/trunk</connection>
<developerConnection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/ontology-config-reader/trunk</developerConnection>
<url>https://svn.code.sf.net/p/psidev/svn/psi/tools/ontology-config-reader/trunk</url>
</scm>

<build>
<plugins>
<!-- Conversion of XML Schema into Java source code using JAXB-XJC -->
<plugin>
<groupId>com.sun.tools.xjc.maven2</groupId>
<artifactId>maven-jaxb-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<generatePackage>psidev.psi.tools.ontologyCfgReader.mapping.jaxb</generatePackage>
<includeSchemas>
Expand All @@ -47,58 +31,43 @@
<strict>true</strict>
<verbose>true</verbose>
</configuration>
</plugin>

<!-- Assembly -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>${descriptor}</descriptor>
</configuration>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<!-- Tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>

<!-- 3rd party -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
</dependency>

<!-- JAXB related deps -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>

<!-- Tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>

<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>

</project>
Loading

0 comments on commit d5a18b6

Please sign in to comment.