Skip to content

Commit

Permalink
Merge pull request #5437 from edwintorok/private/edvint/sdk-fix-java-…
Browse files Browse the repository at this point in the history
…build

Xen-API Java SDK: fix the build (reintroduce 2.20 API version definition)
  • Loading branch information
robhoes authored Feb 12, 2024
2 parents 210d034 + 34f68c7 commit 13d9599
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ sdksanity: sdk
sed -i 's/FriendlyErrorNames.ResourceManager/null/g' ./_build/install/default/xapi/sdk/csharp/src/Failure.cs
cd _build/install/default/xapi/sdk/csharp/src && dotnet add package Newtonsoft.Json && dotnet build -f netstandard2.0

.PHONY: sdk-build-java

sdk-build-java: sdk
cd _build/install/default/xapi/sdk/java && mvn -f xen-api/pom.xml -B clean package install -Drevision=0.0

python:
$(MAKE) -C scripts/examples/python build
Expand Down
7 changes: 7 additions & 0 deletions ocaml/idl/datamodel_types.ml
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,13 @@ let release_order_full =
; branding= "Citrix Hypervisor 8.2 Hotfix 2"
; release_date= Some "November 2020"
}
; {
code_name= Some "nile-preview"
; version_major= 2
; version_minor= 20
; branding= "XenServer 8 Preview"
; release_date= Some "August 2023"
}
]
(* When you add a new release, use the version number of the latest release, "Unreleased"
for the branding, and Some "" for the release date, until the actual values are finalised. *)
Expand Down
2 changes: 1 addition & 1 deletion ocaml/idl/schematest.ml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let hash x = Digest.string x |> Digest.to_hex
(* BEWARE: if this changes, check that schema has been bumped accordingly in
ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)

let last_known_schema_hash = "2de13a69470d10b12910322f8a6bce85"
let last_known_schema_hash = "a99342e7a24557948df221c8da46ae71"

let current_schema_hash : string =
let open Datamodel_types in
Expand Down

0 comments on commit 13d9599

Please sign in to comment.