aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--moaSig/build.gradle160
-rw-r--r--moaSig/common/build.gradle36
-rw-r--r--moaSig/gradle/wrapper/gradle-wrapper.jarbin55627 -> 59203 bytes
-rw-r--r--moaSig/gradle/wrapper/gradle-wrapper.properties4
-rwxr-xr-xmoaSig/gradlew53
-rw-r--r--moaSig/gradlew.bat43
-rw-r--r--moaSig/moa-asic/build.gradle97
-rw-r--r--moaSig/moa-sig-lib/build.gradle86
-rw-r--r--moaSig/moa-sig/build.gradle141
9 files changed, 325 insertions, 295 deletions
diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index 79cda52..3dc1893 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -1,98 +1,96 @@
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
+plugins {
+ id 'java-library'
+ id 'eclipse'
+ id 'maven-publish'
+}
+
+allprojects {
+ version = '3.2.5-SNAPSHOT'
+
+ repositories {
+ mavenLocal()
+ mavenCentral()
+ maven {
+ url "https://apps.egiz.gv.at/maven/"
+ mavenContent {
+ releasesOnly()
+ }
+ }
+ maven {
+ url "https://apps.egiz.gv.at/maven-snapshot/"
+ mavenContent {
+ snapshotsOnly()
+ }
+ }
}
- }
- dependencies {
- classpath "com.bmuschko:gradle-tomcat-plugin:2.2.4"
- }
}
subprojects {
apply plugin: 'java-library'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
- apply plugin: 'maven'
-
- version = '3.2.5-SNAPSHOT'
- 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'
}
-
- jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version }
- compileJava {
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
- }
+ java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ withJavadocJar()
+ withSourcesJar()
+ }
+
+ tasks.withType(JavaCompile).configureEach {
+ options.compilerArgs << '-Xlint:-options'
+ }
- tasks.withType(JavaCompile) {
- options.compilerArgs << '-Xlint:-options'
- }
-
- publishing {
- publications {
- mavenJava(MavenPublication) {
- from components.java
- // more goes in here
- }
- }
- repositories {
- maven {
- // change to point to your repo, e.g. http://my.org/repo
- url = "$buildDir/repo"
- }
- mavenLocal()
- }
+ tasks.withType(Javadoc).configureEach {
+ failOnError = false
+ options.addStringOption('Xdoclint:none', '-quiet')
}
-
- task deployJar(type: Jar)
- configurations {
- deployerJars
-
- }
-
- dependencies {
- deployerJars "org.apache.maven.wagon:wagon-ssh:3.4.3"
-
- }
+ jar {
+ manifest {
+ attributes(
+ provider: 'EGIZ',
+ 'Specification-Version': getCheckedOutGitCommitHash(),
+ 'Implementation-Version': project.version
+ )
+ }
+ }
- 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"))
-
- }
- }
- }
-
-
+ publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ from components.java
+ }
+ }
+ repositories {
+ maven {
+ url = uri("$buildDir/repo")
+ }
+ mavenLocal()
+ maven {
+ name = "egizReleases"
+ url = uri("sftp://apps.egiz.gv.at/maven")
+ credentials {
+ username = System.getenv("EGIZ_MAVEN_USER")
+ password = System.getenv("EGIZ_MAVEN_PASSWORD")
+ }
+ allowInsecureProtocol = true
+ }
+ maven {
+ name = "egizSnapshots"
+ url = uri("sftp://apps.egiz.gv.at/maven-snapshot")
+ credentials {
+ username = System.getenv("EGIZ_MAVEN_USER")
+ password = System.getenv("EGIZ_MAVEN_PASSWORD")
+ }
+ allowInsecureProtocol = true
+ }
+ }
+ }
}
def getCheckedOutGitCommitHash() {
@@ -100,7 +98,7 @@ def getCheckedOutGitCommitHash() {
def takeFromHash = 40
def head = new File(gitFolder + "HEAD").text.split(":")
def isCommit = head.length == 1
- if(isCommit) return head[0].trim().take(takeFromHash)
+ if (isCommit) return head[0].trim().take(takeFromHash)
def refHead = new File(gitFolder + head[1].trim())
- refHead.text.trim().take takeFromHash
+ refHead.text.trim().take(takeFromHash)
}
diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 5f12e76..6054eff 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -1,24 +1,34 @@
+plugins {
+ id 'java-library'
+}
+
dependencies {
- implementation files('../libs/iaik_jce_full_signed-6.1_moa.jar')
- api 'org.slf4j:slf4j-api:1.7.36'
- api 'xerces:xercesImpl:2.12.2'
- api 'xalan:xalan:2.7.1'
- api group: 'xalan', name: 'serializer', version: '2.7.1'
- api 'joda-time:joda-time:2.12.7'
- api 'jaxen:jaxen:1.2.0'
+ implementation files('../libs/iaik_jce_full_signed-6.1_moa.jar')
+
+ api 'org.slf4j:slf4j-api:1.7.36'
+ api 'xerces:xercesImpl:2.12.2'
+ api 'xalan:xalan:2.7.1'
+ api 'xalan:serializer:2.7.1'
+ api 'joda-time:joda-time:2.12.7'
+ api 'jaxen:jaxen:1.2.0'
}
-task testJar(type: Jar, dependsOn: testClasses) {
+java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ withJavadocJar()
+ withSourcesJar()
+}
+
+tasks.register('testJar', Jar) {
+ archiveClassifier.set('tests')
from sourceSets.test.output
- classifier = 'tests'
}
configurations {
- testArtifacts.extendsFrom testCompile
+ testArtifacts
}
artifacts {
- testArtifacts testJar
- //archives testJar
+ testArtifacts(tasks.named('testJar'))
}
-
diff --git a/moaSig/gradle/wrapper/gradle-wrapper.jar b/moaSig/gradle/wrapper/gradle-wrapper.jar
index 75ae3ac..e708b1c 100644
--- a/moaSig/gradle/wrapper/gradle-wrapper.jar
+++ b/moaSig/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/moaSig/gradle/wrapper/gradle-wrapper.properties b/moaSig/gradle/wrapper/gradle-wrapper.properties
index e6fc1b1..17655d0 100644
--- a/moaSig/gradle/wrapper/gradle-wrapper.properties
+++ b/moaSig/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/moaSig/gradlew b/moaSig/gradlew
index cccdd3d..4f906e0 100755
--- a/moaSig/gradlew
+++ b/moaSig/gradlew
@@ -1,5 +1,21 @@
#!/usr/bin/env sh
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
##############################################################################
##
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -159,14 +177,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"
diff --git a/moaSig/gradlew.bat b/moaSig/gradlew.bat
index e95643d..ac1b06f 100644
--- a/moaSig/gradlew.bat
+++ b/moaSig/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle
index 0a8fd83..b2b7299 100644
--- a/moaSig/moa-asic/build.gradle
+++ b/moaSig/moa-asic/build.gradle
@@ -1,30 +1,33 @@
-//plugins {
-// id 'com.intershop.gradle.jaxb' version '5.1.0'
-//}
+plugins {
+ id 'java-library'
+ id 'distribution'
+}
-apply plugin: 'java-library-distribution'
+java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+}
distributions {
- main{
- distributionBaseName = 'MOA-ASIC'
- }
+ main {
+ distributionBaseName.set('MOA-ASIC')
+ }
}
configurations {
jaxb
-
}
dependencies {
- jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '3.0.2'
- jaxb group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
+ jaxb 'com.sun.xml.bind:jaxb-xjc:3.0.2'
+ jaxb 'org.glassfish.jaxb:jaxb-runtime:3.0.2'
- implementation project(':common')
+ implementation project(':common')
implementation project(':moa-sig-lib')
- api 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
- api 'jakarta.xml.ws:jakarta.xml.ws-api:3.0.1'
- implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '1.7.36'
+ api 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
+ api 'jakarta.xml.ws:jakarta.xml.ws-api:3.0.1'
+ implementation 'org.slf4j:log4j-over-slf4j:1.7.36'
}
sourceSets {
@@ -35,48 +38,34 @@ sourceSets {
}
}
-/*
-jaxb {
- // generate java code from schema
- javaGen {
- //generates a 'project' schema file from existing java code
- posConfig {
- schema = file('src/main/resources/schemas/asic.xsd')
- packageName = 'at.gv.egiz.asic'
- outputDir = file( "${projectDir}/src/generated/java" )
- }
+tasks.register('jaxb') {
+ group = 'build'
+ description = 'Generates Java classes from XSD using JAXB'
+
+ doLast {
+ def jaxbTargetDir = file("${projectDir}/src/generated/java")
+ jaxbTargetDir.mkdirs()
+
+ ant.taskdef(
+ name: 'xjc',
+ classname: 'com.sun.tools.xjc.XJCTask',
+ classpath: configurations.jaxb.asPath
+ )
+
+ ant.xjc(
+ destdir: jaxbTargetDir.path,
+ package: 'at.gv.egiz.asic',
+ schema: 'src/main/resources/schemas/asic.xsd'
+ )
}
-
}
-*/
-
-task jaxb () {
- // output directory
- def jaxbTargetDir = file( "${projectDir}/src/generated/java" )
- //jaxbTargetDirMoaSig = file( jaxbTargetDir.path )
-
- // perform actions
- doLast {
- jaxbTargetDir.mkdirs()
-
- ant.taskdef(name: 'xjc', classname: 'com.sun.tools.xjc.XJCTask', classpath: configurations.jaxb.asPath)
- //ant.jaxbTargetDirMoaSig = jaxbTargetDir
-
- // MOA Sig
- ant.xjc(
- destdir: jaxbTargetDir.path,
- package: 'at.gv.egiz.asic',
- schema: 'src/main/resources/schemas/asic.xsd'
- )
- }
-}
-
-task releases(type: Copy) {
- //from jar.outputs
- from distZip.outputs
- from distTar.outputs
- into rootDir.toString() + "/releases/" + version
+tasks.register('releases', Copy) {
+ dependsOn tasks.named('distZip'), tasks.named('distTar')
+ from(tasks.named('distZip'))
+ from(tasks.named('distTar'))
+ into layout.projectDirectory.dir("releases/${version}")
}
-task publishPubNamePublicationToMavenLocal {}
+// This is a placeholder – only include if needed by CI or to avoid errors
+tasks.register('publishPubNamePublicationToMavenLocal') {}
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index 34fec09..ee46ed9 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -1,48 +1,56 @@
-apply plugin: 'java-library-distribution'
-apply plugin: 'maven-publish'
+plugins {
+ id 'java-library'
+ id 'distribution'
+ id 'maven-publish'
+}
+
+java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+}
distributions {
main {
- distributionBaseName = 'moa-spss-lib'
+ distributionBaseName.set('moa-spss-lib')
}
}
-dependencies {
- implementation project(':common')
- testImplementation project(path: ':common', configuration: 'testArtifacts')
-
- api fileTree(dir: '../libs', include: '*.jar')
- //api fileTree(dir: '../libs_debug', include: '*.jar')
-
- api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.1.5'
- api 'commons-logging:commons-logging:1.2'
- api 'commons-io:commons-io:2.16.1'
- api 'commons-codec:commons-codec:1.16.0'
- api 'org.apache.axis:axis-jaxrpc:1.4'
- api 'org.xerial:sqlite-jdbc:3.46.1.0'
- api 'javax.activation:activation:1.1.1'
- api 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
- api 'com.sun.xml.bind:jaxb-core:3.0.2'
- api 'com.sun.xml.bind:jaxb-impl:3.0.2'
- api 'org.postgresql:postgresql:42.7.1'
- api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.32'
- api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.32'
- api group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.32'
- api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.32'
- api group: 'org.apache.pdfbox', name: 'preflight-app', version: '2.0.32'
- api group: 'org.apache.commons', name: 'commons-lang3', version: '3.16.0'
- api group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.14'
- api group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.36'
-
- testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.10.1'
- testImplementation group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.10.1'
- testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.1'
- testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
+dependencies {
+ implementation project(':common')
+ testImplementation project(path: ':common', configuration: 'testArtifacts')
+
+ api fileTree(dir: '../libs', include: ['*.jar'])
+ // api fileTree(dir: '../libs_debug', include: ['*.jar'])
+
+ api 'at.gv.egovernment.moa.sig:tsl-lib:2.2.0-SNAPSHOT'
+ api 'commons-logging:commons-logging:1.2'
+ api 'commons-io:commons-io:2.16.1'
+ api 'commons-codec:commons-codec:1.16.0'
+ api 'org.apache.axis:axis-jaxrpc:1.4'
+ api 'org.xerial:sqlite-jdbc:3.46.1.0'
+ api 'javax.activation:activation:1.1.1'
+ api 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
+ api 'com.sun.xml.bind:jaxb-core:3.0.2'
+ api 'com.sun.xml.bind:jaxb-impl:3.0.2'
+ api 'org.postgresql:postgresql:42.7.1'
+
+ api 'org.apache.pdfbox:pdfbox:2.0.32'
+ api 'org.apache.pdfbox:pdfbox-tools:2.0.32'
+ api 'org.apache.pdfbox:pdfbox-app:2.0.32'
+ api 'org.apache.pdfbox:preflight:2.0.32'
+ api 'org.apache.pdfbox:preflight-app:2.0.32'
+ api 'org.apache.commons:commons-lang3:3.16.0'
+ api 'org.apache.httpcomponents:httpclient-cache:4.5.14'
+ api 'org.slf4j:jcl-over-slf4j:1.7.36'
+
+ testImplementation 'org.junit.jupiter:junit-jupiter-migrationsupport:5.10.1'
+ testImplementation 'org.junit.platform:junit-platform-engine:1.10.1'
+ testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.13'
}
-task releases(type: Copy) {
- //from jar.outputs
- from distZip.outputs
- //from distTar.outputs
- into rootDir.toString() + "/releases/" + version
+tasks.register('releases', Copy) {
+ dependsOn(tasks.named('distZip')) // Ensure distZip runs first
+ from(tasks.named('distZip'))
+ into layout.projectDirectory.dir("releases/${version}")
}
diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle
index 423ea20..eba2e76 100644
--- a/moaSig/moa-sig/build.gradle
+++ b/moaSig/moa-sig/build.gradle
@@ -1,33 +1,40 @@
-apply plugin: 'war'
-apply plugin: 'eclipse'
-apply plugin: 'eclipse-wtp'
-apply plugin: 'distribution'
-apply plugin: 'maven-publish'
+plugins {
+ id 'java-library'
+ id 'war'
+ id 'eclipse'
+ id 'eclipse-wtp'
+ id 'distribution'
+ id 'maven-publish'
+}
+
+java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+}
configurations {
jaxb
}
dependencies {
- jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '3.0.2'
- jaxb group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
+ jaxb 'com.sun.xml.bind:jaxb-xjc:3.0.2'
+ jaxb 'org.glassfish.jaxb:jaxb-runtime:3.0.2'
- implementation project(':common')
- implementation project(':moa-sig-lib')
+ implementation project(':common')
+ implementation project(':moa-sig-lib')
implementation project(':moa-asic')
- implementation fileTree(dir: 'libs', include: '*.jar')
- compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
- implementation 'commons-discovery:commons-discovery:0.5'
- implementation 'org.apache.logging.log4j:log4j-1.2-api:2.22.1'
- implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '1.7.36'
- implementation group: 'javax.jws', name: 'javax.jws-api', version: '1.1'
- implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+ implementation 'commons-discovery:commons-discovery:0.5'
+ implementation 'org.apache.logging.log4j:log4j-1.2-api:2.22.1'
+ implementation 'org.slf4j:log4j-over-slf4j:1.7.36'
+ implementation 'javax.jws:javax.jws-api:1.1'
+ implementation 'ch.qos.logback:logback-classic:1.2.13'
- testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.10.1'
- testImplementation group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.10.1'
- testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.1'
- testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
-
+ testImplementation 'org.junit.jupiter:junit-jupiter-migrationsupport:5.10.1'
+ testImplementation 'org.junit.platform:junit-platform-engine:1.10.1'
+ testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.13'
}
sourceSets {
@@ -38,66 +45,66 @@ sourceSets {
}
}
-war {
- archiveBaseName = "moa-spss"
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-
-task jaxb () {
- // output directory
- def jaxbTargetDir = file( "${projectDir}/src/generated/java" )
+tasks.register('jaxb') {
+ group = 'build'
+ description = 'Generates Java classes from XSD using JAXB'
- // perform actions
doLast {
+ def jaxbTargetDir = file("${projectDir}/src/generated/java")
jaxbTargetDir.mkdirs()
- ant.taskdef(name: 'xjc', classname: 'com.sun.tools.xjc.XJCTask', classpath: configurations.jaxb.asPath)
+ ant.taskdef(
+ name: 'xjc',
+ classname: 'com.sun.tools.xjc.XJCTask',
+ classpath: configurations.jaxb.asPath
+ )
- // MOA Sig
ant.xjc(
- destdir: jaxbTargetDir.path,
- package: 'at.gv.egiz.moasig',
- schema: 'src/main/resources/resources/schemas/MOA-SPSS-3.1.2.xsd'
+ destdir: jaxbTargetDir.path,
+ package: 'at.gv.egiz.moasig',
+ schema: 'src/main/resources/resources/schemas/MOA-SPSS-3.1.2.xsd'
)
}
}
+war {
+ archiveBaseName.set("moa-spss")
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
distributions {
- main {
- distributionBaseName = "moa-spss"
- contents {
- into('/') { // Copy the following jars to the lib/ directory in the distribution archive
- from war.outputs
- from "$rootDir/../release-infos/readme_" + "$version" + ".txt"
- dirMode = 0755
- fileMode = 0644
- }
- into('/handbook') {
- from rootDir.toString() + "/../release-infos/handbook/"
- }
- into('/endorsed_libs') {
- from findJar('serializer')
- from findJar('xalan')
- from findJar('xercesImpl')
- from findJar('xml-apis')
- }
- into('/ext_libs') {
- from findJar('iaik_jce_full')
- from rootDir.toString() + "/../release-infos/ext_libs/"
-
- }
+ main {
+ distributionBaseName.set("moa-spss")
+ contents {
+ into('/') {
+ from(tasks.named('war'))
+ from("$rootDir/../release-infos/readme_${version}.txt")
+ dirMode = 0755
+ fileMode = 0644
+ }
+ into('/handbook') {
+ from("$rootDir/../release-infos/handbook")
+ }
+ into('/endorsed_libs') {
+ from(findJar('serializer'))
+ from(findJar('xalan'))
+ from(findJar('xercesImpl'))
+ from(findJar('xml-apis'))
+ }
+ into('/ext_libs') {
+ from(findJar('iaik_jce_full'))
+ from("$rootDir/../release-infos/ext_libs/")
+ }
+ }
}
- }
}
-def findJar(prefix) {
- configurations.runtimeClasspath.filter { it.name.startsWith(prefix) }
-
+def findJar(String prefix) {
+ return configurations.runtimeClasspath.filter { it.name.startsWith(prefix) }
}
-task releases(type: Copy) {
- from distZip.outputs
- //from distTar.outputs
- into rootDir.toString() + "/releases/" + version
+tasks.register('releases', Copy) {
+ dependsOn(tasks.named('distZip'))
+ from(tasks.named('distZip'))
+ into "$rootDir/releases/${version}"
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-13 12:22:21 +0000