From 5e66df88b3a21edd0a51d1f1139e66ba93ea9df1 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Sun, 12 Dec 2021 12:33:19 +0100 Subject: update gradle build to deploy artifacts into EGIZ maven repo --- build.gradle | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 6fe2c297..7eac8db6 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ subprojects { apply plugin: 'java-library' apply plugin: 'eclipse' apply plugin: 'maven-publish' - //apply plugin: 'maven' + apply plugin: 'maven' group = 'at.gv.egiz.pdfas' configurations { @@ -54,7 +54,22 @@ subprojects { cveCheck } - repositories { mavenCentral() } + repositories { + mavenCentral() + + maven { + url "https://apps.egiz.gv.at/maven/" + mavenContent { + releasesOnly() + } + } + maven { + url "https://apps.egiz.gv.at/maven-snapshot/" + mavenContent { + snapshotsOnly() + } + } + } dependencies { testImplementation 'junit:junit:4.13.2' @@ -136,12 +151,25 @@ subprojects { } } -// uploadArchives { -// repositories.mavenDeployer { -// repository(url: project.releaseRepoUrl) -// snapshotRepository(url: project.snapshotRepoUrl) -// } -// } + dependencies { + deployerJars "org.apache.maven.wagon:wagon-ssh:2.9" + + } + + uploadArchives { + repositories.mavenDeployer { + configuration = configurations.deployerJars + repository(url: "sftp://apps.egiz.gv.at/maven") { + authentication(userName: System.getenv("EGIZ_MAVEN_USER"), password: System.getenv("EGIZ_MAVEN_PASSWORD")) + + } + snapshotRepository(url: "sftp://apps.egiz.gv.at/maven-snapshot") { + authentication(userName: System.getenv("EGIZ_MAVEN_USER"), password: System.getenv("EGIZ_MAVEN_PASSWORD")) + + } + } + } + task(internalRelease) { doLast { -- cgit v1.2.3 From 9aae8448405c93c5384be3a33b52bd4434faf972 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Mon, 13 Dec 2021 13:28:33 +0100 Subject: Update dependencies --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 7eac8db6..982b3abf 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ configurations { } dependencies { - cveCheck 'org.owasp:dependency-check-ant:1.2.5' + cveCheck 'org.owasp:dependency-check-ant:6.3.2' } task checkCVE { -- cgit v1.2.3 From 66edcf7bab6a846617b77db54a89fab624d87df5 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Mon, 13 Dec 2021 14:22:24 +0100 Subject: Update dependencies --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 982b3abf..9ee031f5 100644 --- a/build.gradle +++ b/build.gradle @@ -97,8 +97,8 @@ subprojects { //tomcatVersion = '7.0.54'; //tomcatVersion = '8.0.36'; tomcatVersion = '9.0.46'; - slf4jVersion = '1.7.30' - cxfVersion = '3.0.1' + slf4jVersion = '1.7.32' + cxfVersion = '3.4.5' } jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version } -- cgit v1.2.3 From af00cd9b80a3f752ae1544bf4dbe8fe3dc60807e Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Mon, 13 Dec 2021 15:05:22 +0100 Subject: Update to gradle version of OWASP dependency check --- build.gradle | 54 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 9ee031f5..a9ce4c20 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { dependencies { classpath "com.github.ben-manes:gradle-versions-plugin:0.28.0" + classpath "org.owasp:dependency-check-gradle:6.5.0.1" } } @@ -15,43 +16,16 @@ allprojects { version = '4.2.1-SNAPSHOT' } -configurations { - cveCheck -} - -dependencies { - cveCheck 'org.owasp:dependency-check-ant:6.3.2' -} - -task checkCVE { - doLast { - // Redefine checkCVEAnt Ant task, with the classpath property set to our newly defined - // cveCheck configuration classpath. - ant.taskdef(name: 'checkCVEAnt', classname: 'org.owasp.dependencycheck.taskdefs.DependencyCheckTask', - classpath: configurations.cveCheck.asPath) - - // executing checkCVEAnt Task - ant.checkCVEAnt( - applicationname: "PDF-AS", - reportoutputdirectory: (new File(rootDir, 'releases/cvecheck/' + project.name)).toString(), - reportformat: "ALL") { - fileset(dir: (new File(rootDir, 'build/alldependencies')).toString()) { - include(name: '**/**') - } - } - } -} - subprojects { apply plugin: 'java-library' apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: 'maven' + apply plugin: 'org.owasp.dependencycheck' group = 'at.gv.egiz.pdfas' configurations { deployerJars - cveCheck } repositories { @@ -73,7 +47,6 @@ subprojects { dependencies { testImplementation 'junit:junit:4.13.2' - cveCheck 'org.owasp:dependency-check-ant:6.1.3' } task sourcesJar(type: Jar, dependsOn: classes) { @@ -112,30 +85,7 @@ subprojects { from configurations.runtime into 'build/alldependencies' } - - rootProject.checkCVE.dependsOn copyDeps - - task checkCVELocal { - doLast { - // Redefine checkCVEAnt Ant task, with the classpath property set to our newly defined - // cveCheck configuration classpath. - ant.taskdef(name: 'checkCVEAnt', classname: 'org.owasp.dependencycheck.taskdefs.DependencyCheckTask', - classpath: configurations.cveCheck.asPath) - - // executing checkCVEAnt Task - ant.checkCVEAnt( - applicationname: project.name, - reportoutputdirectory: (new File(rootDir, 'releases/' + version + '/cvecheck/' + project.name)).toString(), - reportformat: "ALL") { - fileset(dir: 'build/alldependencies') { - include(name: '**/**') - } - } - } - } - checkCVELocal.dependsOn copyDepsLocal - publishing { publications { myLibrary(MavenPublication) { -- cgit v1.2.3 From 671e7ac84cf8aab81dec5d19979ba564c5f63deb Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Tue, 21 Dec 2021 10:20:27 +0100 Subject: Update wagon-ssh --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index a9ce4c20..4d5f0d41 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,7 @@ subprojects { } dependencies { - deployerJars "org.apache.maven.wagon:wagon-ssh:2.9" + deployerJars "org.apache.maven.wagon:wagon-ssh:3.4.3" } -- cgit v1.2.3