Skip to content

Commit

Permalink
Merge pull request #11 from safrant/master
Browse files Browse the repository at this point in the history 
Merge v2.19 branch
  • Loading branch information
@safrant
safrant authored Jun 21, 2023
2 parents c8e09fa + 1141c2d commit 894543e
Show file tree
Hide file tree
Showing 331 changed files with 1,609 additions and 1,324 deletions.
329 changes: 198 additions & 131 deletions .classpath
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

.idea/

software/browser-util/build/

software/target/

software/ncitbrowser/build/
Binary file modified software/browser-util/browser-util.jar
View file
Binary file not shown.
5 changes: 3 additions & 2 deletions software/browser-util/build.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<project name="projectname" default="build" basedir=".">
<project name="browser-util" default="build" basedir=".">
<property file="build.properties" />

<property name="resources.dir" value = "./resources" />
Expand Down Expand Up @@ -29,6 +29,7 @@

<target name="clean" description="Delete the build directory">
<delete dir="${build.dir}" />
<delete file="browser-util.jar"/>
</target>
<target name="init" depends="clean">
<echo>JAVA_HOME: ${java.home}</echo>
Expand All @@ -37,7 +38,7 @@

<target name="compile" depends="init"
description="Compile source code">
<javac srcdir="${src.dir}" destdir="${build.dir}" >
<javac srcdir="${src.dir}" destdir="${build.dir}" debug="true">
<classpath refid="classpath" />
<include name="**/*.java" />
</javac>
Expand Down
172 changes: 172 additions & 0 deletions software/browser-util/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apacche.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>gov.nih.nci.evs</groupId>
<artifactId>browser-util</artifactId>
<version>3.0</version>

<properties>
<lexevs.version>6.6.0.FINAL</lexevs.version>
<spring.version>5.3.21</spring.version>
<java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>


<dependencies>
<dependency>
<groupId>lexevs</groupId>
<artifactId>lexbig-impl</artifactId>
<version>${lexevs.version}</version>
<exclusions>
<exclusion>
<groupId>slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<groupId>slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.LexGrid.LexBIG</groupId>
<artifactId>LexEVSService</artifactId>
<version>${lexevs.version}</version>
<exclusions>
<exclusion>
<groupId>slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<groupId>slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>


<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.5.0-b01</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution><id>build-ant</id>
<phase>install</phase>
<goals>
<goal>run</goal>
</goals>

</execution>
</executions>
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>nci.maven.releases</id>
<name>NCI Maven Release Repository</name>
<url>https://ncimvn.nci.nih.gov/nexus/content/repositories/LexEVSRelease</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>nci.maven.thirdparty</id>
<name>NCI Maven 3rd Party Repository</name>
<url>https://ncimvn.nci.nih.gov/nexus/content/repositories/LexEVS3rdParty</url>
</repository>
<repository>
<id>mvnrepository</id>
<name>maven central</name>
<url>https://mvnrepository.com/artifact</url>
</repository>
</repositories>
</project>
Loading

0 comments on commit 894543e

Please sign in to comment.