Skip to content

Commit

Permalink
Merge pull request #7 from eurekaclinical/master
Browse files Browse the repository at this point in the history
Latest Updates from eurekaclinical
  • Loading branch information
ndeshpa authored Feb 26, 2020
2 parents e993a11 + 7fa5995 commit 9abfa9e
Show file tree
Hide file tree
Showing 24 changed files with 450 additions and 394 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ pom.xml.releaseBackup
pom.xml.next
release.properties
/bin/
/.classpath
/.project
12 changes: 8 additions & 4 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,27 @@ This project includes:
Apache Commons CLI under Apache License, Version 2.0
Apache Commons Codec under Apache License, Version 2.0
Apache Commons Collections under Apache License, Version 2.0
Apache Commons DBCP under The Apache Software License, Version 2.0
Apache Commons DBCP under Apache License, Version 2.0
Apache Commons IO under Apache License, Version 2.0
Apache Commons Lang under Apache License, Version 2.0
Apache Commons Pool under The Apache Software License, Version 2.0
Apache Commons Logging under The Apache Software License, Version 2.0
Apache Commons Pool under Apache License, Version 2.0
Apache POI under The Apache Software License, Version 2.0
Commons IO under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
Core Protege under Mozilla Public License
Datastore under Apache License, Version 2.0
Drools :: Rete-OO Core under The Apache Software License, Version 2.0
H2 Database Engine under MPL 2.0 or EPL 1.0
Hamcrest Core under New BSD License
ini4j under Apache 2
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
JavaUtil under Apache License, Version 2.0
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
JGoodies Common under The BSD License
JGoodies Looks under The BSD License
JUnit under Eclipse Public License 1.0
mvel under The Apache Software License, Version 2.0
Old JAXB Core under CDDL+GPL License
Old JAXB Runtime under CDDL+GPL License
opencsv under Apache 2
Oracle NoSQL Database Server under Apache 2
Protempa under Apache License, Version 2.0
Expand Down
280 changes: 142 additions & 138 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,138 +1,142 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa</artifactId>
<version>5.1-Beta-6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Protempa</name>
<url>https://github.com/eurekaclinical/protempa.git</url>
<inceptionYear>2012</inceptionYear>
<description>Protempa supports the construction of software systems for
querying clinical databases, summarizing patient data, detecting clinically
significant data patterns in groups of patients or individual patients, and
extract, transform and load (ETL). Its special feature, temporal abstraction,
supports queries and summarization of data in terms of temporal patterns.
Temporal patterns enable robust querying and extraction of clinical history.
These patterns include frequencies (at least two, three, etc. of some event or
observation); sequences (chemotherapy followed by surgery within 180 days,
a hospital encounter followed by another hospital encounter within 30 days);
and overlaps (falling platelet counts in the setting of HELLP syndrome).
</description>

<parent>
<groupId>org.eurekaclinical</groupId>
<artifactId>eurekaclinical-parent-standard-deps</artifactId>
<version>4-Alpha-3</version>
</parent>

<scm>
<connection>scm:git:https://github.com/eurekaclinical/protempa.git</connection>
<developerConnection>scm:git:https://github.com/eurekaclinical/protempa.git</developerConnection>
<url>https://github.com/eurekaclinical/protempa.git</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/eurekaclinical/protempa/issues</url>
</issueManagement>

<modules>
<module>protempa-framework</module>
<module>protempa-bcp-serviceloader</module>
<module>protempa-bp-serviceloader</module>
<module>protempa-ksb-protege</module>
<module>protempa-dsb-relationaldb</module>
<module>protempa-dsb-file</module>
<module>protempa-test-suite</module>
<module>protempa-bconfigs-ini4j-ini</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-bconfigs-ini4j-ini</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-bcp-serviceloader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-bp-serviceloader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-dsb-relationaldb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-framework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-ksb-protege</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-test-suite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>javautil</artifactId>
<version>[4.4,)</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>datastore</artifactId>
<version>[3.2,)</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<licenseName>apache_v2</licenseName>
<roots>
<root>src/main</root>
<root>src/test/java/</root>
</roots>
<extraExtensions>
<!-- .xsd files are not supported by default -->
<!-- but should be commented in XML style -->
<xsd>xml</xsd>
</extraExtensions>
</configuration>
</plugin>
<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
<configuration>
<noticeTemplate>etc/NOTICE.template</noticeTemplate>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa</artifactId>
<version>5.2-Alpha-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Protempa</name>
<url>https://github.com/eurekaclinical/protempa.git</url>
<inceptionYear>2012</inceptionYear>
<description>Protempa supports the construction of software systems for
querying clinical databases, summarizing patient data, detecting clinically
significant data patterns in groups of patients or individual patients, and
extract, transform and load (ETL). Its special feature, temporal abstraction,
supports queries and summarization of data in terms of temporal patterns.
Temporal patterns enable robust querying and extraction of clinical history.
These patterns include frequencies (at least two, three, etc. of some event or
observation); sequences (chemotherapy followed by surgery within 180 days,
a hospital encounter followed by another hospital encounter within 30 days);
and overlaps (falling platelet counts in the setting of HELLP syndrome).
</description>

<parent>
<groupId>org.eurekaclinical</groupId>
<artifactId>eurekaclinical-parent-standard-deps</artifactId>
<version>4-Alpha-4-SNAPSHOT</version>
</parent>

<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>

<scm>
<connection>scm:git:https://github.com/eurekaclinical/protempa.git</connection>
<developerConnection>scm:git:https://github.com/eurekaclinical/protempa.git</developerConnection>
<url>https://github.com/eurekaclinical/protempa.git</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/eurekaclinical/protempa/issues</url>
</issueManagement>

<modules>
<module>protempa-framework</module>
<module>protempa-bcp-serviceloader</module>
<module>protempa-bp-serviceloader</module>
<module>protempa-ksb-protege</module>
<module>protempa-dsb-relationaldb</module>
<module>protempa-dsb-file</module>
<module>protempa-test-suite</module>
<module>protempa-bconfigs-ini4j-ini</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-bconfigs-ini4j-ini</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-bcp-serviceloader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-bp-serviceloader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-dsb-relationaldb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-framework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-ksb-protege</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa-test-suite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>javautil</artifactId>
<version>4.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eurekaclinical</groupId>
<artifactId>datastore</artifactId>
<version>3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<licenseName>apache_v2</licenseName>
<roots>
<root>src/main</root>
<root>src/test/java/</root>
</roots>
<extraExtensions>
<!-- .xsd files are not supported by default -->
<!-- but should be commented in XML style -->
<xsd>xml</xsd>
</extraExtensions>
</configuration>
</plugin>
<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
<configuration>
<noticeTemplate>etc/NOTICE.template</noticeTemplate>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
6 changes: 5 additions & 1 deletion protempa-bconfigs-ini4j-ini/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,19 @@ This project includes:
Apache Commons CLI under Apache License, Version 2.0
Apache Commons Codec under Apache License, Version 2.0
Apache Commons Collections under Apache License, Version 2.0
Apache Commons IO under Apache License, Version 2.0
Apache Commons Lang under Apache License, Version 2.0
Commons IO under The Apache Software License, Version 2.0
Datastore under Apache License, Version 2.0
Drools :: Rete-OO Core under The Apache Software License, Version 2.0
Hamcrest Core under New BSD License
ini4j under Apache 2
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
JavaUtil under Apache License, Version 2.0
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
JUnit under Eclipse Public License 1.0
mvel under The Apache Software License, Version 2.0
Old JAXB Core under CDDL+GPL License
Old JAXB Runtime under CDDL+GPL License
Oracle NoSQL Database Server under Apache 2
Protempa Framework under Apache License, Version 2.0
Protempa Ini4j INI Backend Configurations under Apache License, Version 2.0
Expand Down
2 changes: 1 addition & 1 deletion protempa-bconfigs-ini4j-ini/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa</artifactId>
<version>5.1-Beta-6-SNAPSHOT</version>
<version>5.2-Alpha-1-SNAPSHOT</version>
</parent>

<groupId>org.eurekaclinical</groupId>
Expand Down
4 changes: 4 additions & 0 deletions protempa-bcp-serviceloader/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ This project includes:
Datastore under Apache License, Version 2.0
Drools :: Rete-OO Core under The Apache Software License, Version 2.0
Hamcrest Core under New BSD License
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
JavaUtil under Apache License, Version 2.0
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
JUnit under Eclipse Public License 1.0
mvel under The Apache Software License, Version 2.0
Old JAXB Core under CDDL+GPL License
Old JAXB Runtime under CDDL+GPL License
Oracle NoSQL Database Server under Apache 2
Protempa Framework under Apache License, Version 2.0
Protempa ServiceLoader Backend Configurations Provider under Apache License, Version 2.0
Expand Down
2 changes: 1 addition & 1 deletion protempa-bcp-serviceloader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa</artifactId>
<version>5.1-Beta-6-SNAPSHOT</version>
<version>5.2-Alpha-1-SNAPSHOT</version>
</parent>

<groupId>org.eurekaclinical</groupId>
Expand Down
4 changes: 4 additions & 0 deletions protempa-bp-serviceloader/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ This project includes:
Datastore under Apache License, Version 2.0
Drools :: Rete-OO Core under The Apache Software License, Version 2.0
Hamcrest Core under New BSD License
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
JavaUtil under Apache License, Version 2.0
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
JUnit under Eclipse Public License 1.0
mvel under The Apache Software License, Version 2.0
Old JAXB Core under CDDL+GPL License
Old JAXB Runtime under CDDL+GPL License
Oracle NoSQL Database Server under Apache 2
Protempa Framework under Apache License, Version 2.0
Protempa ServiceLoader Backend Provider under Apache License, Version 2.0
Expand Down
2 changes: 1 addition & 1 deletion protempa-bp-serviceloader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eurekaclinical</groupId>
<artifactId>protempa</artifactId>
<version>5.1-Beta-6-SNAPSHOT</version>
<version>5.2-Alpha-1-SNAPSHOT</version>
</parent>

<groupId>org.eurekaclinical</groupId>
Expand Down
Loading

0 comments on commit 9abfa9e

Please sign in to comment.