Skip to content

Feature v2 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 23 commits into
base: release
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f157533
Updated to use onixlabs-corda-core 2.0.0 and onixlabs-corda-identity-…
MrMatthewLayton Jun 21, 2021
864f149
Removed references to jcenter due to shutdown, and added maven packag…
MrMatthewLayton Jun 23, 2021
b8f81ec
Various updates in preparation for Version 2.0.0
MrMatthewLayton Jul 3, 2021
fbdb6ec
Added liquibase scripts for relationship configuration.
MrMatthewLayton Jul 3, 2021
4875f83
BROKEN COMMIT: FIX OR REVERT!
MrMatthewLayton Aug 9, 2021
99aad31
[BROKEN] Updated to point to latest ONIXlabs dependencies.
MrMatthewLayton Aug 14, 2021
81b7f8b
Publishing version 2.0.0-rc1
MrMatthewLayton Oct 28, 2021
2949e05
Added empty companion objects to settings classes.
MrMatthewLayton Nov 3, 2021
b6e5a62
Version bump to support 3.1.0 dependencies.
MrMatthewLayton Nov 24, 2021
ff31f3b
Version bump to support 3.2.0 dependencies.
MrMatthewLayton Nov 29, 2021
bf04656
Version bump.
MrMatthewLayton Dec 3, 2021
1f03ce4
Version bump.
MrMatthewLayton Dec 16, 2021
fe1bb04
Version bump.
MrMatthewLayton Dec 16, 2021
c8e7ced
Version bump.
MrMatthewLayton Dec 21, 2021
1d0fb8b
Preparation for major version release 2.0.0
MrMatthewLayton Feb 18, 2022
2f76b53
Preparation for major version release 2.0.0
MrMatthewLayton Feb 20, 2022
c977bd0
Version bump to Corda 4.9
MrMatthewLayton Apr 18, 2022
2b2cda5
One-off version reverting to Corda 4.8 for internal work.
MrMatthewLayton Aug 2, 2022
504e159
One-off version reverting to Corda 4.8 for internal work.
MrMatthewLayton Aug 2, 2022
0ef94c5
One-off version reverting to Corda 4.8 for internal work.
MrMatthewLayton Aug 3, 2022
5dce6a0
One-off version reverting to Corda 4.8 for internal work.
MrMatthewLayton Aug 3, 2022
832f90f
Added `@Transient` annotation to criteria fields in resolvable implem…
MrMatthewLayton Aug 18, 2022
f032ae0
Replaced `@Transient` annotation with `get()` to criteria fields in r…
MrMatthewLayton Aug 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
max_line_length = 140
2 changes: 1 addition & 1 deletion HEADER
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2020-2021 ONIXLabs
Copyright 2020-2022 ONIXLabs

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![ONIX Labs](https://raw.githubusercontent.com/onix-labs/onix-labs.github.io/master/content/logo/master_full_md.png)
![ONIX Labs](https://raw.githubusercontent.com/onix-labs/onixlabs-website/main/src/assets/images/logo/full/original/original-md.png)

# ONIXLabs Corda BNMS

Expand Down
32 changes: 22 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {

corda_artifactory_url = 'https://software.r3.com/artifactory'
corda_group = 'net.corda'
corda_release_version = '4.6'
corda_release_version = '4.9'

corda_gradle_plugin_group = 'net.corda.plugins'
corda_gradle_plugin_version = '5.0.4'
Expand All @@ -14,10 +14,10 @@ buildscript {
junit_version = '5.3.1'

onixlabs_group = 'io.onixlabs'
onixlabs_corda_core_release_version = '1.2.0'
onixlabs_corda_idfx_release_version = '2.0.0-rc2'
onixlabs_corda_core_release_version = '4.0.3'
onixlabs_corda_idfx_release_version = '4.0.3'

cordapp_platform_version = 8
cordapp_platform_version = 11
cordapp_contract_name = 'ONIXLabs Corda BNMS Contract'
cordapp_workflow_name = 'ONIXLabs Corda BNMS Workflow'
cordapp_vendor_name = 'ONIXLabs'
Expand All @@ -34,7 +34,6 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
jcenter()
maven { url "$corda_artifactory_url/corda-releases" }
maven { url "$corda_artifactory_url/corda-dependencies" }
}
Expand All @@ -45,21 +44,28 @@ buildscript {
}
}

group 'io.onixlabs'
version '1.0.0'
group getProperty('group')
version getProperty('version')

subprojects {
repositories {
mavenLocal()
mavenCentral()
jcenter()
maven { url "https://jitpack.io" }
maven { url "$corda_artifactory_url/corda-releases" }
maven { url "$corda_artifactory_url/corda-dependencies" }
maven { url "https://repo.gradle.org/gradle/libs-releases" }
maven {
name = "GitHubPackagesCIF"
url = uri("https://maven.pkg.github.com/onix-labs/onixlabs-corda-identity-framework-beta")
name = "GitHubPackages-onixlabs-corda-core"
url = uri("https://maven.pkg.github.com/onix-labs/onixlabs-corda-core")
credentials {
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USERNAME")
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
}
}
maven {
name = "GitHubPackages-onixlabs-corda-identity-framework"
url = uri("https://maven.pkg.github.com/onix-labs/onixlabs-corda-identity-framework")
credentials {
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USERNAME")
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
Expand Down Expand Up @@ -87,10 +93,16 @@ subprojects {
}
}

task sourceJar(type: Jar) {
from sourceSets.main.allSource
archiveClassifier = "sources"
}

jar { exclude '**/log4j2*.xml' }

test {
jvmArgs = ["-ea", "-javaagent:../lib/quasar.jar"]
maxHeapSize = "4096m"
useJUnitPlatform()
}
}
Expand Down
5 changes: 1 addition & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name=onixlabs-corda-bnms
group=io.onixlabs

kotlin.incremental=false
kotlin.code.style=official

version=2.0.0-rc16
onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3
2 changes: 2 additions & 0 deletions onixlabs-corda-bnms-contract/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies {

// CorDapp Dependencies
cordapp "$onixlabs_group:onixlabs-corda-core-contract:$onixlabs_corda_core_release_version"
cordapp "$onixlabs_group:onixlabs-corda-core-workflow:$onixlabs_corda_core_release_version"
cordapp "$onixlabs_group:onixlabs-corda-identity-framework-contract:$onixlabs_corda_idfx_release_version"

// Test Dependencies
Expand All @@ -53,6 +54,7 @@ publishing {
groupId = project.parent.group
version = project.parent.version
artifactId = 'onixlabs-corda-bnms-contract'
artifact sourceJar
from components.java
}
}
Expand Down
Loading