Skip to content

Commit 5f39be7

Browse files
committed
COH-21598 : Enable running C++ tests during build against latest Java Snapshot. (merge main -> 14.1.1 @ 80744)
[git-p4: depot-paths = "//dev/release.cpp/coherence-cpp-v14.1.1.0/": change = 80763]
1 parent 0251402 commit 5f39be7

File tree

5 files changed

+18
-2
lines changed

5 files changed

+18
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
-----
1010
<img src=https://coherence.java.net/assets/img/logo-community.png><img>
1111

12+
![CI Build](https://github.com/oracle/coherence-cpp-extend-client/workflows/CI%20Build/badge.svg)
1213
[![License](http://img.shields.io/badge/license-UPL%201.0-blue.svg)](https://oss.oracle.com/licenses/upl/)
1314

1415
# Oracle Coherence for C++ Community Edition

prj/build-import.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<property name="ivy.jar.dir" value="${tools.common.dir}/ant-contrib/lib"/>
7878
<property name="ivy.version" value="2.4.0"/>
7979
<property name="ivy.jar" value="${ivy.jar.dir}/ivy-${ivy.version}.jar"/>
80+
<property name="ivy.file" value="ivy.xml"/>
8081
<available property="ivy-exists" file="${ivy.jar}"/>
8182

8283
<!-- Default C++ compilation properties -->
@@ -748,7 +749,7 @@
748749
<param name="banner.message" value="Resolving dependencies"/>
749750
</antcall>
750751
<ivy:settings file ="${prj.dir}/ivy-settings.xml"/>
751-
<ivy:resolve file ="${prj.dir}/ivy.xml"/>
752+
<ivy:resolve file ="${prj.dir}/${ivy.file}"/>
752753
<ivy:retrieve pattern="${lib.dir}/[artifact].[ext]"/>
753754
</target>
754755

prj/build.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
build.description=
1414
build.type=debug
1515
build.version=14.1.1.0.2
16+
build.groupId_maven=com.oracle.coherence.ce
1617
build.version_maven=14.1.1-0-1

prj/ivy-snapshot.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2000, 2020, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
http://oss.oracle.com/licenses/upl.
7+
-->
8+
<ivy-module version="2.0">
9+
<info organisation="com.oracle" module="coherence"/>
10+
<dependencies>
11+
<dependency org="${build.groupId_maven}" name="coherence" rev="${build.version_maven}" changing="true"/>
12+
</dependencies>
13+
</ivy-module>

prj/ivy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<ivy-module version="2.0">
99
<info organisation="com.oracle" module="coherence"/>
1010
<dependencies>
11-
<dependency org="com.oracle.coherence.ce" name="coherence" rev="${build.version_maven}" conf="default"/>
11+
<dependency org="${build.groupId_maven}" name="coherence" rev="${build.version_maven}" conf="default"/>
1212
</dependencies>
1313
</ivy-module>

0 commit comments

Comments
 (0)