ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-21 13:57:56 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Update build.gradle

Browse Source 
Removed merge conflicts [no ci]
This commit is contained in:
Cyrus 2023-05-25 06:41:28 -04:00 committed by GitHub
parent 10fa9948f0
commit 5e0ccc94ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -6,7 +6,7 @@ plugins {
id 'application'
}
<<<<<<< HEAD
// Global checkstyle file
ext.checkstyleConfigFile = new File(rootDir, "/config/checkstyle/sun_checks.xml")
@ -37,7 +37,7 @@ def gitHash = { ->
project.ext["jarVersion"] = "${projectVersion}.${buildTime}.${gitHash}"
project.ext["packageVersion"] = "${projectVersion}.${buildTime}.${gitHash}.el8"
=======
//dependencies {
// implementation project(':HIRS_Utils')
// implementation project(':HIRS_AttestationCA')
@ -102,5 +102,3 @@ project.ext["packageVersion"] = "${projectVersion}.${buildTime}.${gitHash}.el8"
//// buildRpm {
//// arch = X86_64
//// }
////}
>>>>>>> 6661a6ca (Checking in updated code. This set does build and load in a rocky)