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(-) 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 56c389b4373e10edda7f5dbc38b0d6abad3aa9ca Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Sun, 12 Dec 2021 12:33:31 +0100 Subject: add GitLab CI configuration --- .gitlab-ci.yml | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..310e2051 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,84 @@ +image: gradle:6.8.3-jdk11 + +variables: + LC_ALL: "en_US.UTF-8" + LANG: "en_US.UTF-8" + LANGUAGE: "en_US" + LIB_NAME: "PDF-AS 4" + GIT_DEPTH: "2" + SECURE_LOG_LEVEL: "debug" + +include: + - template: Dependency-Scanning.gitlab-ci.yml + - template: Security/SAST.gitlab-ci.yml + - template: Secret-Detection.gitlab-ci.yml + +default: + tags: + - docker + +stages: + - assemble + - test + - package + - release + +cache: + paths: + - .m2/repository + - .gradle/wrapper + - .gradle/caches + +assemble: + stage: assemble + tags: + - docker + except: + - tags + script: | + ./gradlew clean build --warning-mode all + artifacts: + when: always + reports: + junit: "**/build/test-results/test/**/TEST-*.xml" + +release_packaging: + stage: package + tags: + - docker + except: + - tags + before_script: + - mkdir -p ~/.ssh + - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + script: | + ./gradlew assemble uploadArchives + artifacts: + when: always + name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}" + reports: + dotenv: variables.env + +release: + stage: release + image: registry.gitlab.com/gitlab-org/release-cli:latest + tags: + - docker + needs: + - job: assemble + artifacts: true + when: manual + only: + - master + script: | + echo "Releasing version $VERSION of $LIB_NAME" + echo "Publishing version $VERSION to public EGIZ maven" + cd ./moaSig + ./gradlew release + artifacts: + name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}-release" + expire_in: never + paths: + - "../release/${VERSION}/pdf-as-web-${VERSION}.war" + - "../release/${VERSION}/pdf-as-lib-${VERSION}.zip" -- cgit v1.2.3 From 81a59d7be006fc69088386736dd7627cb8ff2bd6 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Sun, 12 Dec 2021 13:48:24 +0100 Subject: deactivate jUnit tests for GitLab CI testing, because jUnits don't work --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 310e2051..3e03b4d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ assemble: except: - tags script: | - ./gradlew clean build --warning-mode all + ./gradlew --warning-mode all -x test clean build artifacts: when: always reports: @@ -53,7 +53,7 @@ release_packaging: - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts script: | - ./gradlew assemble uploadArchives + ./gradlew -x test assemble uploadArchives artifacts: when: always name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}" -- cgit v1.2.3 From 6f36c5c075c91ff191944ee5c1a399c6be0be1a1 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Sun, 12 Dec 2021 14:48:14 +0000 Subject: Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e03b4d7..4a117a89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ release_packaging: - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts script: | - ./gradlew -x test assemble uploadArchives + ./gradlew --stacktrace -x test assemble uploadArchives artifacts: when: always name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}" -- 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 +- pdf-as-cli/build.gradle | 2 +- pdf-as-common/build.gradle | 2 +- pdf-as-lib/build.gradle | 2 +- pdf-as-pdfbox-2/build.gradle | 2 +- pdf-as-web/build.gradle | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) 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 { diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle index 79efe54a..a2ef1283 100644 --- a/pdf-as-cli/build.gradle +++ b/pdf-as-cli/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2' implementation group: 'commons-cli', name: 'commons-cli', version: '1.2' implementation group: 'javax.activation', name: 'activation', version: '1.1.1' - implementation 'ch.qos.logback:logback-classic:1.1.2' + implementation 'ch.qos.logback:logback-classic:1.2.7' testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-common/build.gradle b/pdf-as-common/build.gradle index a607fcfe..b57f9b6f 100644 --- a/pdf-as-common/build.gradle +++ b/pdf-as-common/build.gradle @@ -25,7 +25,7 @@ dependencies { api group: 'commons-io', name: 'commons-io', version: '2.8.0' api group: 'ognl', name: 'ognl', version: '3.2.19' api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - api 'commons-codec:commons-codec:1.10' + api 'commons-codec:commons-codec:1.15' api group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' testImplementation group: 'junit', name: 'junit', version: '4.+' diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle index e55ac6a3..6adbcc7e 100644 --- a/pdf-as-lib/build.gradle +++ b/pdf-as-lib/build.gradle @@ -84,7 +84,7 @@ dependencies { api group: 'com.google.zxing', name: 'core', version: '3.4.1' api group: 'com.google.zxing', name: 'javase', version: '3.4.1' testImplementation group: 'junit', name: 'junit', version: '4.+' - testCompile "junit:junit:4.11" + testCompile "junit:junit:4.13.2" ws group: 'org.apache.cxf', name: 'cxf-tools', version: cxfVersion ws group: 'org.apache.cxf', name: 'cxf-tools-wsdlto-databinding-jaxb', version: cxfVersion ws group: 'org.apache.cxf', name: 'cxf-tools-wsdlto-frontend-jaxws', version: cxfVersion diff --git a/pdf-as-pdfbox-2/build.gradle b/pdf-as-pdfbox-2/build.gradle index 66c003ec..32d314ae 100644 --- a/pdf-as-pdfbox-2/build.gradle +++ b/pdf-as-pdfbox-2/build.gradle @@ -32,7 +32,7 @@ releases.dependsOn sourcesJar dependencies { implementation project (':pdf-as-lib') implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion - implementation 'org.slf4j:jcl-over-slf4j:1.7.30' + implementation 'org.slf4j:jcl-over-slf4j:1.7.32' api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.23' api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.23' api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.23' diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index f6479d55..eac334af 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -58,11 +58,11 @@ dependencies { api group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3' api "commons-codec:commons-codec:1.15" api 'org.apache.commons:commons-lang3:3.12.0' - api 'org.apache.cxf:cxf-rt-transports-http:3.4.1' - api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.1' - api 'com.thetransactioncompany:cors-filter:2.9.1' - api 'ch.qos.logback:logback-classic:1.2.3' - api 'ch.qos.logback:logback-core:1.2.3' + api 'org.apache.cxf:cxf-rt-transports-http:3.4.5' + api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5' + api 'com.thetransactioncompany:cors-filter:2.10' + api 'ch.qos.logback:logback-classic:1.2.7' + api 'ch.qos.logback:logback-core:1.2.7' api 'org.json:json:20210307' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' pdfbox2 project (':pdf-as-pdfbox-2') -- cgit v1.2.3 From 8fd4517a8d1b9ecae515fc9d45e1fdd8d6254279 Mon Sep 17 00:00:00 2001 From: Alexander Marsalek Date: Mon, 13 Dec 2021 13:48:24 +0100 Subject: missing files --- pdf-as-pdfbox-2/src/test/resources/1Sign_manyQR.pdf | Bin 0 -> 188967 bytes pdf-as-pdfbox-2/src/test/resources/new_qr_2-2.pdf | Bin 0 -> 182043 bytes pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed.pdf | Bin 0 -> 225097 bytes .../src/test/resources/new_qr_2_signed_signed.pdf | Bin 0 -> 267093 bytes .../test/resources/new_qr_2_signed_signed_signed.pdf | Bin 0 -> 310607 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 pdf-as-pdfbox-2/src/test/resources/1Sign_manyQR.pdf create mode 100644 pdf-as-pdfbox-2/src/test/resources/new_qr_2-2.pdf create mode 100644 pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed.pdf create mode 100644 pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed_signed.pdf create mode 100644 pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed_signed_signed.pdf diff --git a/pdf-as-pdfbox-2/src/test/resources/1Sign_manyQR.pdf b/pdf-as-pdfbox-2/src/test/resources/1Sign_manyQR.pdf new file mode 100644 index 00000000..0784592a Binary files /dev/null and b/pdf-as-pdfbox-2/src/test/resources/1Sign_manyQR.pdf differ diff --git a/pdf-as-pdfbox-2/src/test/resources/new_qr_2-2.pdf b/pdf-as-pdfbox-2/src/test/resources/new_qr_2-2.pdf new file mode 100644 index 00000000..565ce8e6 Binary files /dev/null and b/pdf-as-pdfbox-2/src/test/resources/new_qr_2-2.pdf differ diff --git a/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed.pdf b/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed.pdf new file mode 100644 index 00000000..be6fdddb Binary files /dev/null and b/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed.pdf differ diff --git a/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed_signed.pdf b/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed_signed.pdf new file mode 100644 index 00000000..ee0f140f Binary files /dev/null and b/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed_signed.pdf differ diff --git a/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed_signed_signed.pdf b/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed_signed_signed.pdf new file mode 100644 index 00000000..34769dd0 Binary files /dev/null and b/pdf-as-pdfbox-2/src/test/resources/new_qr_2_signed_signed_signed.pdf differ -- 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 ++-- pdf-as-web-statistic-api/build.gradle | 2 +- pdf-as-web/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 } diff --git a/pdf-as-web-statistic-api/build.gradle b/pdf-as-web-statistic-api/build.gradle index aa9429d7..377c0714 100644 --- a/pdf-as-web-statistic-api/build.gradle +++ b/pdf-as-web-statistic-api/build.gradle @@ -22,7 +22,7 @@ sourceSets.test.runtimeClasspath += configurations.providedCompile dependencies { implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion - implementation 'org.apache.commons:commons-lang3:3.3.2' + implementation 'org.apache.commons:commons-lang3:3.12.0' testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index eac334af..4ba67e18 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -51,7 +51,7 @@ dependencies { api project (':signature-standards:sigs-pades') api project (':pdf-as-web-status') api project (':pdf-as-web-statistic-api') - api group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1' + api group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4' api group: 'opensymphony', name: 'sitemesh', version: '2.4.2' api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' api group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' -- 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(-) 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 88a6b34c4798f32c13de407aca57799a03ec8570 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Mon, 13 Dec 2021 15:18:26 +0100 Subject: Update pdfbox --- pdf-as-pdfbox-2/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pdf-as-pdfbox-2/build.gradle b/pdf-as-pdfbox-2/build.gradle index 32d314ae..cb5ff296 100644 --- a/pdf-as-pdfbox-2/build.gradle +++ b/pdf-as-pdfbox-2/build.gradle @@ -33,9 +33,9 @@ dependencies { implementation project (':pdf-as-lib') implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion implementation 'org.slf4j:jcl-over-slf4j:1.7.32' - api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.23' - api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.23' - api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.23' + api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.24' + api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.24' + api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.24' implementation group: 'commons-io', name: 'commons-io', version: '2.8' implementation group: 'ognl', name: 'ognl', version: '3.2.19' testImplementation group: 'junit', name: 'junit', version: '4.+' -- cgit v1.2.3 From 9cbe202087a5bb0291b676c916426f0ba50229cc Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Mon, 13 Dec 2021 15:35:46 +0100 Subject: Update gretty --- pdf-as-web/build.gradle | 8 ++++---- pdf-as-web/gradle.properties | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 pdf-as-web/gradle.properties diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 4ba67e18..efcb263e 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'eclipse' apply plugin: 'eclipse-wtp' apply plugin: 'war' -apply plugin: 'org.akhikhl.gretty' +apply plugin: 'org.gretty' buildscript { repositories { @@ -16,7 +16,7 @@ buildscript { } dependencies { - classpath 'org.akhikhl.gretty:gretty:+' + classpath 'org.gretty:gretty:3.0.7' } } @@ -72,8 +72,8 @@ dependencies { gretty { // supported values: - // 'jetty7', 'jetty8', 'jetty9', 'tomcat7', 'tomcat8' - servletContainer = 'jetty9' + // 'jetty7', 'jetty8', 'jetty9', 'jetty9.3', 'jetty9.4', 'tomcat8.5', 'tomcat9' + servletContainer = 'jetty9.4' jvmArgs = [ '-Dpdf-as-web.conf=' + System.getProperty("user.home") + '/.pdfas/pdf-as-web.properties' ] } diff --git a/pdf-as-web/gradle.properties b/pdf-as-web/gradle.properties new file mode 100644 index 00000000..887ae74e --- /dev/null +++ b/pdf-as-web/gradle.properties @@ -0,0 +1,3 @@ +jetty94Version = 9.4.44.v20210927 +jetty93Version = 9.3.30.v20211001 +jetty9Version = 9.2.30.v20200428 \ No newline at end of file -- cgit v1.2.3 From 4eb673f1d100423ad7a892460b1f11938173db47 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Tue, 14 Dec 2021 12:38:59 +0100 Subject: Use Tomcat --- pdf-as-web/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index efcb263e..6337a448 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -72,8 +72,8 @@ dependencies { gretty { // supported values: - // 'jetty7', 'jetty8', 'jetty9', 'jetty9.3', 'jetty9.4', 'tomcat8.5', 'tomcat9' - servletContainer = 'jetty9.4' + // 'jetty7', 'jetty8', 'jetty9', 'jetty9.3', 'jetty9.4', 'tomcat85', 'tomcat9' + servletContainer = 'tomcat85' jvmArgs = [ '-Dpdf-as-web.conf=' + System.getProperty("user.home") + '/.pdfas/pdf-as-web.properties' ] } -- cgit v1.2.3 From 5decefe848b9856215b5f37326d3bf31e287d9c2 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Thu, 16 Dec 2021 12:48:19 +0100 Subject: Update Hibernate --- pdf-as-web-db/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pdf-as-web-db/build.gradle b/pdf-as-web-db/build.gradle index 91a4825d..feca3308 100644 --- a/pdf-as-web-db/build.gradle +++ b/pdf-as-web-db/build.gradle @@ -17,8 +17,8 @@ dependencies { implementation project (':pdf-as-web') implementation project (':pdf-as-web-status') implementation project (':pdf-as-web-statistic-api') - api "org.hibernate:hibernate-core:4.3.11.Final" - api "org.hibernate:hibernate-entitymanager:4.3.11.Final" + api "org.hibernate:hibernate-core:5.6.2.Final" + api "org.hibernate:hibernate-entitymanager:5.6.2.Final" implementation group: 'log4j', name: 'log4j', version: '1.2.17' implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion testImplementation group: 'junit', name: 'junit', version: '4.+' -- cgit v1.2.3 From f16b75cde0083d4325c702e152e9ade8c4725164 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Thu, 16 Dec 2021 13:07:52 +0100 Subject: Update logback --- pdf-as-cli/build.gradle | 2 +- pdf-as-web-db/build.gradle | 2 +- pdf-as-web/build.gradle | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle index a2ef1283..169355b4 100644 --- a/pdf-as-cli/build.gradle +++ b/pdf-as-cli/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2' implementation group: 'commons-cli', name: 'commons-cli', version: '1.2' implementation group: 'javax.activation', name: 'activation', version: '1.1.1' - implementation 'ch.qos.logback:logback-classic:1.2.7' + implementation 'ch.qos.logback:logback-classic:1.2.8' testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-web-db/build.gradle b/pdf-as-web-db/build.gradle index feca3308..7a104466 100644 --- a/pdf-as-web-db/build.gradle +++ b/pdf-as-web-db/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation project (':pdf-as-web-statistic-api') api "org.hibernate:hibernate-core:5.6.2.Final" api "org.hibernate:hibernate-entitymanager:5.6.2.Final" - implementation group: 'log4j', name: 'log4j', version: '1.2.17' + implementation 'ch.qos.logback:logback-classic:1.2.8' implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 6337a448..3d43861b 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -61,8 +61,8 @@ dependencies { api 'org.apache.cxf:cxf-rt-transports-http:3.4.5' api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5' api 'com.thetransactioncompany:cors-filter:2.10' - api 'ch.qos.logback:logback-classic:1.2.7' - api 'ch.qos.logback:logback-core:1.2.7' + api 'ch.qos.logback:logback-classic:1.2.8' + api 'ch.qos.logback:logback-core:1.2.8' api 'org.json:json:20210307' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' pdfbox2 project (':pdf-as-pdfbox-2') @@ -272,13 +272,8 @@ task releases(dependsOn: buildTomcat, type: Copy) { from archive from tararchive into rootDir.toString() + "/releases/" + version - - - } - - releases.dependsOn jar releases.dependsOn sourcesJar releases.dependsOn war -- cgit v1.2.3 From 35c301bd555a0b790b2d6621ed2eff0f3bdbf400 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Thu, 16 Dec 2021 16:25:40 +0100 Subject: Update commons-io --- pdf-as-lib/build.gradle | 2 +- pdf-as-pdfbox-2/build.gradle | 2 +- pdf-as-web/build.gradle | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle index 6adbcc7e..cf15a9c8 100644 --- a/pdf-as-lib/build.gradle +++ b/pdf-as-lib/build.gradle @@ -70,7 +70,7 @@ dependencies { api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' api group: 'com.google.code.gson', name: 'gson', version: '2.8.6' api group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.7.6' - api group: 'commons-io', name: 'commons-io', version: '2.8' + api group: 'commons-io', name: 'commons-io', version: '2.8.0' api group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3' api 'org.apache.commons:commons-collections4:4.4' api group: 'ognl', name: 'ognl', version: '3.2.19' diff --git a/pdf-as-pdfbox-2/build.gradle b/pdf-as-pdfbox-2/build.gradle index cb5ff296..606ebc70 100644 --- a/pdf-as-pdfbox-2/build.gradle +++ b/pdf-as-pdfbox-2/build.gradle @@ -36,7 +36,7 @@ dependencies { api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.24' api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.24' api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.24' - implementation group: 'commons-io', name: 'commons-io', version: '2.8' + implementation group: 'commons-io', name: 'commons-io', version: '2.8.0' implementation group: 'ognl', name: 'ognl', version: '3.2.19' testImplementation group: 'junit', name: 'junit', version: '4.+' diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 3d43861b..4752ed67 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -52,6 +52,8 @@ dependencies { api project (':pdf-as-web-status') api project (':pdf-as-web-statistic-api') api group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4' + // Upgrade dependency of commons-fileupload from 2.2 to 2.8.0 to avoid CVE-2021-29425 + api group: 'commons-io', name: 'commons-io', version: '2.8.0' api group: 'opensymphony', name: 'sitemesh', version: '2.4.2' api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' api group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' -- cgit v1.2.3 From 46beb0d52f88af3109415866bdd0e9829d50e8a8 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Tue, 21 Dec 2021 07:34:28 +0100 Subject: update GitLb CI configuration to exclude deployArchives in case of 'feature' and 'issue' branches --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a117a89..1cd13b89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,8 @@ release_packaging: - docker except: - tags + - /^feature/.*$/i + - /^issue.*$/i before_script: - mkdir -p ~/.ssh - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts -- 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(-) 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 From 4cb2ff10b3925c9234b8090b08fbd68584617ada Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Wed, 22 Dec 2021 16:54:48 +0100 Subject: Update logback (CVE-2021-42550) + other dependencies --- pdf-as-cli/build.gradle | 2 +- pdf-as-lib/build.gradle | 2 +- pdf-as-moa/build.gradle | 2 +- pdf-as-pdfbox-2/build.gradle | 6 +++--- pdf-as-web-db/build.gradle | 2 +- pdf-as-web/build.gradle | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle index 169355b4..cb365244 100644 --- a/pdf-as-cli/build.gradle +++ b/pdf-as-cli/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2' implementation group: 'commons-cli', name: 'commons-cli', version: '1.2' implementation group: 'javax.activation', name: 'activation', version: '1.1.1' - implementation 'ch.qos.logback:logback-classic:1.2.8' + implementation 'ch.qos.logback:logback-classic:1.2.9' testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle index cf15a9c8..cff40ef0 100644 --- a/pdf-as-lib/build.gradle +++ b/pdf-as-lib/build.gradle @@ -68,7 +68,7 @@ dependencies { api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68' api group: 'javax.activation', name: 'activation', version: '1.1.1' api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - api group: 'com.google.code.gson', name: 'gson', version: '2.8.6' + api group: 'com.google.code.gson', name: 'gson', version: '2.8.9' api group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.7.6' api group: 'commons-io', name: 'commons-io', version: '2.8.0' api group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3' diff --git a/pdf-as-moa/build.gradle b/pdf-as-moa/build.gradle index 62fa9530..fd438cbc 100644 --- a/pdf-as-moa/build.gradle +++ b/pdf-as-moa/build.gradle @@ -13,7 +13,7 @@ buildscript { mavenLocal() mavenCentral() } - dependencies { classpath("commons-io:commons-io:2.4") } + dependencies { classpath("commons-io:commons-io:2.8.0") } } sourceSets { diff --git a/pdf-as-pdfbox-2/build.gradle b/pdf-as-pdfbox-2/build.gradle index 606ebc70..b37462bd 100644 --- a/pdf-as-pdfbox-2/build.gradle +++ b/pdf-as-pdfbox-2/build.gradle @@ -33,9 +33,9 @@ dependencies { implementation project (':pdf-as-lib') implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion implementation 'org.slf4j:jcl-over-slf4j:1.7.32' - api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.24' - api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.24' - api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.24' + api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.25' + api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.25' + api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.25' implementation group: 'commons-io', name: 'commons-io', version: '2.8.0' implementation group: 'ognl', name: 'ognl', version: '3.2.19' testImplementation group: 'junit', name: 'junit', version: '4.+' diff --git a/pdf-as-web-db/build.gradle b/pdf-as-web-db/build.gradle index 7a104466..492e36d9 100644 --- a/pdf-as-web-db/build.gradle +++ b/pdf-as-web-db/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation project (':pdf-as-web-statistic-api') api "org.hibernate:hibernate-core:5.6.2.Final" api "org.hibernate:hibernate-entitymanager:5.6.2.Final" - implementation 'ch.qos.logback:logback-classic:1.2.8' + implementation 'ch.qos.logback:logback-classic:1.2.9' implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 4752ed67..64f17319 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -63,8 +63,8 @@ dependencies { api 'org.apache.cxf:cxf-rt-transports-http:3.4.5' api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5' api 'com.thetransactioncompany:cors-filter:2.10' - api 'ch.qos.logback:logback-classic:1.2.8' - api 'ch.qos.logback:logback-core:1.2.8' + api 'ch.qos.logback:logback-classic:1.2.9' + api 'ch.qos.logback:logback-core:1.2.9' api 'org.json:json:20210307' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' pdfbox2 project (':pdf-as-pdfbox-2') -- cgit v1.2.3 From 228b1e2dc09d9554edcd667c68325709d1fb0d3e Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Thu, 23 Dec 2021 12:29:40 +0100 Subject: Update logback --- pdf-as-cli/build.gradle | 2 +- pdf-as-web-db/build.gradle | 2 +- pdf-as-web/build.gradle | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle index cb365244..2854000f 100644 --- a/pdf-as-cli/build.gradle +++ b/pdf-as-cli/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2' implementation group: 'commons-cli', name: 'commons-cli', version: '1.2' implementation group: 'javax.activation', name: 'activation', version: '1.1.1' - implementation 'ch.qos.logback:logback-classic:1.2.9' + implementation 'ch.qos.logback:logback-classic:1.2.10' testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-web-db/build.gradle b/pdf-as-web-db/build.gradle index 492e36d9..6f252a32 100644 --- a/pdf-as-web-db/build.gradle +++ b/pdf-as-web-db/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation project (':pdf-as-web-statistic-api') api "org.hibernate:hibernate-core:5.6.2.Final" api "org.hibernate:hibernate-entitymanager:5.6.2.Final" - implementation 'ch.qos.logback:logback-classic:1.2.9' + implementation 'ch.qos.logback:logback-classic:1.2.10' implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion testImplementation group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 64f17319..cf14365b 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -63,8 +63,8 @@ dependencies { api 'org.apache.cxf:cxf-rt-transports-http:3.4.5' api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5' api 'com.thetransactioncompany:cors-filter:2.10' - api 'ch.qos.logback:logback-classic:1.2.9' - api 'ch.qos.logback:logback-core:1.2.9' + api 'ch.qos.logback:logback-classic:1.2.10' + api 'ch.qos.logback:logback-core:1.2.10' api 'org.json:json:20210307' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' pdfbox2 project (':pdf-as-pdfbox-2') -- cgit v1.2.3