USRE-86 Finish merger and build jar file
This commit is contained in:
parent
8db0792edf
commit
78e6dc9840
|
|
@ -6,11 +6,7 @@
|
||||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||||
<outputRelativeToContentRoot value="true" />
|
<outputRelativeToContentRoot value="true" />
|
||||||
<<<<<<< HEAD
|
|
||||||
<module name="rets-io-client" />
|
<module name="rets-io-client" />
|
||||||
=======
|
|
||||||
<module name="rets-io-client-api" />
|
|
||||||
>>>>>>> origin/rets-io-client-api/main
|
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
||||||
142
pom.xml
142
pom.xml
|
|
@ -1,24 +1,29 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.ossez.rets-io</groupId>
|
<groupId>com.ossez.rets-io</groupId>
|
||||||
<artifactId>rets-io-client</artifactId>
|
<artifactId>rets-io-client</artifactId>
|
||||||
<version>0.1.1</version>
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>REoC RETS Client</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
<name>Rets-Io-Client</name>
|
||||||
<!-- Generic properties -->
|
<description>The RETS API is a Reference Implementation API for RETS Transactions written in Java and can be used as
|
||||||
<java.version>1.8</java.version>
|
an API by web-based and desktop RETS Client Applications.
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
</description>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<url>https://github.com/USRealEstate/rets-io-client.git</url>
|
||||||
|
|
||||||
<!-- LOG -->
|
<developers>
|
||||||
<logback.version>1.2.3</logback.version>
|
<developer>
|
||||||
</properties>
|
<name>YuCheng Hu</name>
|
||||||
|
<id>honeymoose</id>
|
||||||
|
<email>huyuchengus@gmail.com</email>
|
||||||
|
<timezone>-5</timezone>
|
||||||
|
<organization>Open Source</organization>
|
||||||
|
<roles>
|
||||||
|
<role>Sr. Java Developer</role>
|
||||||
|
</roles>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
|
|
@ -34,6 +39,14 @@
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.ossez.usreio</groupId>
|
||||||
|
<artifactId>rets-io-common</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- LOG -->
|
<!-- LOG -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ch.qos.logback</groupId>
|
<groupId>ch.qos.logback</groupId>
|
||||||
|
|
@ -89,6 +102,7 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
<defaultGoal>package</defaultGoal>
|
||||||
<resources>
|
<resources>
|
||||||
<resource>
|
<resource>
|
||||||
<directory>src/main/java</directory>
|
<directory>src/main/java</directory>
|
||||||
|
|
@ -100,6 +114,7 @@
|
||||||
<filtering>true</filtering>
|
<filtering>true</filtering>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
|
@ -125,96 +140,9 @@
|
||||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||||
</descriptorRefs>
|
</descriptorRefs>
|
||||||
</configuration>
|
</configuration>
|
||||||
=======
|
</execution>
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
</executions>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
</plugin>
|
||||||
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>
|
|
||||||
<groupId>com.ossez.usreio</groupId>
|
|
||||||
<artifactId>rets-io-client-api</artifactId>
|
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>Rets-Io-Client-Api</name>
|
|
||||||
<description>The RETS API is a Reference Implementation API for RETS Transactions written in Java and can be used as
|
|
||||||
an API by web-based and desktop RETS Client Applications.
|
|
||||||
</description>
|
|
||||||
<url>https://github.com/USRealEstate/rets-io-validation.git</url>
|
|
||||||
|
|
||||||
<developers>
|
|
||||||
<developer>
|
|
||||||
<name>YuCheng Hu</name>
|
|
||||||
<id>honeymoose</id>
|
|
||||||
<email>huyuchengus@gmail.com</email>
|
|
||||||
<timezone>-5</timezone>
|
|
||||||
<organization>Open Source</organization>
|
|
||||||
<roles>
|
|
||||||
<role>Sr. Java Developer</role>
|
|
||||||
</roles>
|
|
||||||
</developer>
|
|
||||||
</developers>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ossez.usreio</groupId>
|
|
||||||
<artifactId>rets-io-common</artifactId>
|
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>ch.qos.logback</groupId>
|
|
||||||
<artifactId>logback-classic</artifactId>
|
|
||||||
<version>1.2.5</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- APACHE COMMONS -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-httpclient</groupId>
|
|
||||||
<artifactId>commons-httpclient</artifactId>
|
|
||||||
<version>3.1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.ant</groupId>
|
|
||||||
<artifactId>ant</artifactId>
|
|
||||||
<version>1.9.4</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>xalan</groupId>
|
|
||||||
<artifactId>xalan</artifactId>
|
|
||||||
<version>2.7.2</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.activation</groupId>
|
|
||||||
<artifactId>javax.activation-api</artifactId>
|
|
||||||
<version>1.2.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.mail</groupId>
|
|
||||||
<artifactId>mail</artifactId>
|
|
||||||
<version>1.4</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- TESTS -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.junit.jupiter</groupId>
|
|
||||||
<artifactId>junit-jupiter-api</artifactId>
|
|
||||||
<version>5.7.0</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.junit.jupiter</groupId>
|
|
||||||
<artifactId>junit-jupiter-engine</artifactId>
|
|
||||||
<version>5.7.0</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<defaultGoal>package</defaultGoal>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
|
@ -235,17 +163,13 @@
|
||||||
<goals>
|
<goals>
|
||||||
<goal>jar</goal>
|
<goal>jar</goal>
|
||||||
</goals>
|
</goals>
|
||||||
>>>>>>> origin/rets-io-client-api/main
|
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
<<<<<<< HEAD
|
|
||||||
</build>
|
</build>
|
||||||
</project>
|
|
||||||
=======
|
|
||||||
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Generic properties -->
|
<!-- Generic properties -->
|
||||||
|
|
@ -257,6 +181,7 @@
|
||||||
<slf4j.version>1.7.30</slf4j.version>
|
<slf4j.version>1.7.30</slf4j.version>
|
||||||
<log4j.version>1.2.17</log4j.version>
|
<log4j.version>1.2.17</log4j.version>
|
||||||
<log4j2.version>2.2</log4j2.version>
|
<log4j2.version>2.2</log4j2.version>
|
||||||
|
<logback.version>1.2.5</logback.version>
|
||||||
|
|
||||||
<!-- APACHE COMMONS-->
|
<!-- APACHE COMMONS-->
|
||||||
<commons-io.version>2.11.0</commons-io.version>
|
<commons-io.version>2.11.0</commons-io.version>
|
||||||
|
|
@ -301,4 +226,3 @@
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
>>>>>>> origin/rets-io-client-api/main
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue