Skip to content

Commit

Permalink
Merge pull request #30 from clarlars/clarlars-ver-bump
Browse files Browse the repository at this point in the history
Update version for release
  • Loading branch information
wbrunette committed Aug 6, 2019
2 parents d2644b6 + 55dc762 commit 7792923
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 16 deletions.
4 changes: 2 additions & 2 deletions dependencies/mvn_local_installs
@@ -1,2 +1,2 @@
mvn install:install-file -Dfile=odk-rest-interface-2.1.3.jar -Djavadoc=odk-rest-interface-2.1.3-javadoc.jar -Dsources=odk-rest-interface-2.1.3-sources.jar -DgroupId=org.opendatakit -DartifactId=odk-rest-interface -Dversion=2.1.3 -Dpackaging=jar -DupdateReleaseInfo=true
mvn install:install-file -Dfile=sync-client-2.1.3.jar -Djavadoc=sync-client-2.1.3-javadoc.jar -Dsources=sync-client-2.1.3-sources.jar -DpomFile=sync-client-2.1.3.pom -Dpackaging=jar -DupdateReleaseInfo=true
mvn install:install-file -Dfile=odk-rest-interface-2.1.4.jar -Djavadoc=odk-rest-interface-2.1.4-javadoc.jar -Dsources=odk-rest-interface-2.1.4-sources.jar -DgroupId=org.opendatakit -DartifactId=odk-rest-interface -Dversion=2.1.4 -Dpackaging=jar -DupdateReleaseInfo=true
mvn install:install-file -Dfile=sync-client-2.1.4.jar -Djavadoc=sync-client-2.1.4-javadoc.jar -Dsources=sync-client-2.1.4-sources.jar -DpomFile=sync-client-2.1.4.pom -Dpackaging=jar -DupdateReleaseInfo=true
Binary file removed dependencies/odk-rest-interface-2.1.3-javadoc.jar
Binary file not shown.
Binary file removed dependencies/odk-rest-interface-2.1.3-sources.jar
Binary file not shown.
Binary file not shown.
Binary file added dependencies/odk-rest-interface-2.1.4-sources.jar
Binary file not shown.
Binary file not shown.
Binary file removed dependencies/sync-client-2.1.3-javadoc.jar
Binary file not shown.
Binary file added dependencies/sync-client-2.1.4-javadoc.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Expand Up @@ -4,34 +4,35 @@
<groupId>org.opendatakit</groupId>
<artifactId>sync-client</artifactId>
<packaging>jar</packaging>
<version>2.1.3</version>
<version>2.1.4</version>
<name>ODK Sync REST Client</name>
<properties>
<org.opendatakit-odk-rest-interface-version>2.1.3</org.opendatakit-odk-rest-interface-version>
<org.opendatakit-odk-rest-interface-version>2.1.4</org.opendatakit-odk-rest-interface-version>

<com.fasterxml.jackson.version>2.9.8</com.fasterxml.jackson.version>
<com.fasterxml.jackson.version>2.9.9</com.fasterxml.jackson.version>
<com.fasterxml.jackson.databind.version>2.9.9.2</com.fasterxml.jackson.databind.version>

<org.slf4j.version>1.7.25</org.slf4j.version>
<org.slf4j.version>1.7.26</org.slf4j.version>

<org.apache.httpcomponents.version>4.5.7</org.apache.httpcomponents.version>
<org.apache.httpcomponents.version>4.5.9</org.apache.httpcomponents.version>
<org.apache.httpcomponents-httpcore-version>4.4.11</org.apache.httpcomponents-httpcore-version>
<org.apache.httpcomponents-httpmime-version>4.5.7</org.apache.httpcomponents-httpmime-version>
<org.apache.httpcomponents-httpmime-version>4.5.9</org.apache.httpcomponents-httpmime-version>

<commons-fileupload-version>1.4</commons-fileupload-version>
<org.apache.commons-lang3.version>3.5</org.apache.commons-lang3.version>

<org.apache.wink.version>1.4</org.apache.wink.version>

<maven.jar.plugin.version>3.1.1</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.0.1</maven.javadoc.plugin.version>
<maven.jar.plugin.version>3.1.2</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.1.0</maven.javadoc.plugin.version>
<maven.source.plugin.version>3.0.1</maven.source.plugin.version>
<maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.1.1</maven.dependency.plugin.version>
<maven.surefire.report.plugin.version>2.22.1</maven.surefire.report.plugin.version>
<maven.surefire.plugin.version>2.22.1</maven.surefire.plugin.version>

<junit.version>4.12</junit.version>
<jacoco.version>0.8.3</jacoco.version>
<jacoco.version>0.8.4</jacoco.version>

<skipTests>true</skipTests>

Expand Down Expand Up @@ -101,7 +102,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${com.fasterxml.jackson.version}</version>
<version>${com.fasterxml.jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
Expand Down Expand Up @@ -179,7 +180,7 @@

<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven.source.plugin.version}</version>
<version>${maven.jar.plugin.version}</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -217,6 +218,7 @@
<version>${maven.surefire.plugin.version}</version>
<inherited>true</inherited>
<configuration>
<argLine>-Xmx1024m</argLine>
<systemPropertyVariables>
<project.artifactId>${project.artifactId}</project.artifactId>
<test.aggUrl>${aggUrl}</test.aggUrl>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -9,8 +9,8 @@
<version>2.1.4</version>

<properties>
<org.opendatakit.sync-client.version>2.1.3</org.opendatakit.sync-client.version>
<org.opendatakit.odk.rest.interface>2.1.3</org.opendatakit.odk.rest.interface>
<org.opendatakit.sync-client.version>2.1.4</org.opendatakit.sync-client.version>
<org.opendatakit.odk.rest.interface>2.1.4</org.opendatakit.odk.rest.interface>

<org.apache.wink.version>1.4</org.apache.wink.version>
<org.apache.commons.cli.version>1.4</org.apache.commons.cli.version>
Expand Down

0 comments on commit 7792923

Please sign in to comment.