Skip to content
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

CORDA-052 Corda v5.2 Version bump #105

Open
wants to merge 11 commits into
base: release-V4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 11 additions & 37 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,37 +1,11 @@
#!groovy
/**
* Jenkins pipeline to build the kotlin CorDapp template
*/

/**
* Kill already started job.
* Assume new commit takes precedence and results from previousunfinished builds are not required.
* This feature doesn't play well with disableConcurrentBuilds() option
*/
@Library('corda-shared-build-pipeline-steps')
import static com.r3.build.BuildControl.killAllExistingBuildsForJob
killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())

pipeline {
agent {
label 'eight-cores'
}
options {
ansiColor('xterm')
timestamps()
timeout(3*60) // 3 hours
buildDiscarder(logRotator(daysToKeepStr: '7', artifactDaysToKeepStr: '7'))
}
stages {
stage('Build') {
steps {
sh './gradlew --no-daemon -s clean build test deployNodes'
}
}
}
post {
cleanup {
deleteDir()
}
}
}
@Library('[email protected]') _

cordaPipeline(
publishRepoPrefix: '',
slimBuild: true,
runUnitTests: false,
dedicatedJobForSnykDelta: false,
slackChannel: '#corda-corda5-dev-ex-build-notifications',
gitHubComments: false,
javaVersion: '17'
)
6 changes: 6 additions & 0 deletions .ci/nightly/JenkinsfileSnykScan
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@Library('[email protected]') _

cordaSnykScanPipeline (
snykTokenId: 'r3-snyk-corda5',
snykAdditionalCommands: "--all-sub-projects -d"
)
14 changes: 14 additions & 0 deletions .github/workflows/check-pr-title.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Check PR Title'
on:
pull_request:
types: [opened, edited, reopened]

jobs:
check-pr-title:
runs-on: ubuntu-latest
steps:
- uses: morrisoncole/[email protected]
with:
title-regex: '^((CORDA|EG|ENT|INFRA|CORE|ES)-\d+)(.*)'
on-failed-regex-comment: "PR title failed to match regex -> `%regex%`"
repo-token: "${{ secrets.GITHUB_TOKEN }}"
85 changes: 47 additions & 38 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,51 +1,47 @@

# Eclipse, ctags, Mac metadata, log files
.classpath
.project
.settings
tags
.DS_Store
*.log
*.log.gz
*.orig

# Created by .ignore support plugin (hsz.mobi)

.gradle
local.properties
.gradletasknamecache

# General build files
**/build/*
!docs/build/*

lib/dokka.jar
lib/quasar.jar

**/logs/*

### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio

*.iml

## Directory-based project format:
#.idea

# if you remove the above rule, at least ignore the following:

# Specific files to avoid churn
.idea/*.xml
.idea/.name
.idea/copyright
.idea/jsLibraryMappings.xml

# User-specific stuff:
.idea/tasks.xml
.idea/inspectionProfiles
.idea/libraries
.idea/shelf
.idea/dataSources
.idea/markdown-navigator
.idea/runConfigurations
.idea/dictionaries

# Sensitive or high-churn files:
.idea/dataSources.ids
.idea/dataSources.xml
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml

# Gradle:
.idea/libraries
# Include the -parameters compiler option by default in IntelliJ required for serialization.
!.idea/codeStyleSettings.xml

# Mongo Explorer plugin:
.idea/mongoSettings.xml

## File-based project format:
*.ipr
Expand All @@ -54,24 +50,37 @@ lib/dokka.jar
## Plugin-specific files:

# IntelliJ
/out/
workflows/out/
contracts/out/
clients/out/
**/out/
/classes/



# vim
*.swp
*.swn
*.swo



# Directory generated during Resolve and TestOSGi gradle tasks
bnd/

# Ignore Gradle build output directory
build
/.idea/codeStyles/codeStyleConfig.xml
/.idea/codeStyles/Project.xml



# mpeltonen/sbt-idea plugin
.idea_modules/
# Ignore Visual studio directory
bin/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties

# docs related
docs/virtualenv/
*.cpi
*.cpb
*.cpk
workspace/**

# if you use the installQuasar task
lib
# ingore temporary data files
*.dat
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Run_Contract_Tests.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Run_Flow_Tests.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Run_Integration_Tests.xml

This file was deleted.

15 changes: 0 additions & 15 deletions .idea/runConfigurations/Run_Template_Client.xml

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/runConfigurations/Run_Template_Server.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Unit_tests.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Debug CorDapp" type="Remote" factoryName="Remote">
<configuration default="false" name="DebugCorDapp" type="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5007" />
<option name="PORT" value="5005" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5007" />
<option name="DEBUG_PORT" value="5005" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method />
<method v="2" />
</configuration>
</component>
1 change: 0 additions & 1 deletion .settings/org.eclipse.jdt.core.prefs

This file was deleted.

14 changes: 14 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.25.0
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
SNYK-JAVA-ORGJETBRAINSKOTLIN-2393744:
- '*':
reason: >-
This vulnerability relates to information exposure via creation of
temporary files (via Kotlin functions) with insecure permissions.
Corda does not use any of the vulnerable functions so it is not
susceptible to this vulnerability
expires: 2023-10-19T17:08:41.029Z
created: 2023-02-02T17:08:41.032Z
patch: {}
5 changes: 5 additions & 0 deletions FlowManagementUI/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM python
WORKDIR /app
COPY . /app
RUN pip install -r requirements.txt
CMD ["python3", "app.py"]
Loading