Skip to content
This repository has been archived by the owner on Jul 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request #42 from pablo-parra/develop
Browse files Browse the repository at this point in the history
Updated versions for new releases of oasp4j and devonfw
  • Loading branch information
ivanderk authored Jul 5, 2016
2 parents 6e8a9a0 + 22f8b86 commit 7f9f8a4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
9 changes: 4 additions & 5 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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>com.capgemini.devonfw.dev</groupId>
<groupId>com.capgemini.devonfw.dev</groupId>
<artifactId>devonfw</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
Expand All @@ -27,13 +27,12 @@
</scm>

<properties>
<oasp4j.version>2.0.0</oasp4j.version>
<devonfw.version>1.1-SNAPSHOT</devonfw.version>
<spring.boot.version>1.3.0.RELEASE</spring.boot.version>
<oasp4j.version>2.1.0</oasp4j.version>
<devonfw.version>2.0.0</devonfw.version>
<spring.boot.version>1.3.3.RELEASE</spring.boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<cxf.version>3.1.6</cxf.version>
<spring.boot.version>1.3.0.RELEASE</spring.boot.version>
<js.client.dir>src/main/client</js.client.dir>
<devon.flatten.mode>bom</devon.flatten.mode>
<devon.gpg.keyname>?</devon.gpg.keyname>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<description>Application based on the Open Application Standard Platform for Java (OASP4J).</description>

<properties>
<oasp4j.version>2.0.0</oasp4j.version>
<devonfw.version>1.1-SNAPSHOT</devonfw.version>
<spring.boot.version>1.3.0.RELEASE</spring.boot.version>
<oasp4j.version>2.1.0</oasp4j.version>
<devonfw.version>2.0.0</devonfw.version>
<spring.boot.version>1.3.3.RELEASE</spring.boot.version>
<java.version>1.7</java.version>
<oasp.port.range>81</oasp.port.range>
<oasp.http.port>${oasp.port.range}81</oasp.http.port>
Expand Down

0 comments on commit 7f9f8a4

Please sign in to comment.