diff --git a/buildSrc/.gradle/8.10/executionHistory/executionHistory.bin b/buildSrc/.gradle/8.10/executionHistory/executionHistory.bin deleted file mode 100644 index 57ac2e2..0000000 Binary files a/buildSrc/.gradle/8.10/executionHistory/executionHistory.bin and /dev/null differ diff --git a/buildSrc/.gradle/8.10/executionHistory/executionHistory.lock b/buildSrc/.gradle/8.10/executionHistory/executionHistory.lock deleted file mode 100644 index 2fb6870..0000000 Binary files a/buildSrc/.gradle/8.10/executionHistory/executionHistory.lock and /dev/null differ diff --git a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index cdbca25..0000000 Binary files a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/buildSrc/.gradle/buildOutputCleanup/cache.properties b/buildSrc/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 6f7c235..0000000 --- a/buildSrc/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Sat Nov 23 15:57:48 GMT 2024 -gradle.version=8.10 diff --git a/buildSrc/.gradle/buildOutputCleanup/outputFiles.bin b/buildSrc/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 7f3bd43..0000000 Binary files a/buildSrc/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/buildSrc/.gradle/file-system.probe b/buildSrc/.gradle/file-system.probe deleted file mode 100644 index 8a96950..0000000 Binary files a/buildSrc/.gradle/file-system.probe and /dev/null differ diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index 04d80d2..0000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. - id 'groovy-gradle-plugin' -} - -repositories { - // Use the plugin portal to apply community plugins in convention plugins. - gradlePluginPortal() -} diff --git a/buildSrc/build/source-roots/buildSrc/source-roots.txt b/buildSrc/build/source-roots/buildSrc/source-roots.txt deleted file mode 100644 index 548fcf5..0000000 --- a/buildSrc/build/source-roots/buildSrc/source-roots.txt +++ /dev/null @@ -1,7 +0,0 @@ -src/main/resources -src/main/java -build/groovy-dsl-plugins/output/adapter-src -src/main/groovy -src/test/resources -src/test/java -src/test/groovy diff --git a/buildSrc/build/tmp/compileJava/previous-compilation-data.bin b/buildSrc/build/tmp/compileJava/previous-compilation-data.bin deleted file mode 100644 index c31ccb6..0000000 Binary files a/buildSrc/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ diff --git a/buildSrc/build/tmp/jar/MANIFEST.MF b/buildSrc/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index 59499bc..0000000 --- a/buildSrc/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/buildSrc/src/main/groovy/org.onvif.java-conventions.gradle b/buildSrc/src/main/groovy/org.onvif.java-conventions.gradle deleted file mode 100644 index 444133a..0000000 --- a/buildSrc/src/main/groovy/org.onvif.java-conventions.gradle +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'java-library' - id 'maven-publish' -} - -repositories { - mavenLocal() - maven { - url = uri('https://repo.maven.apache.org/maven2/') - } -} - -group = 'org.onvif' -version = '1.0-SNAPSHOT' -java.sourceCompatibility = JavaVersion.VERSION_21 - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -tasks.withType(Javadoc) { - options.encoding = 'UTF-8' -} diff --git a/onvif-java/build.gradle b/onvif-java/build.gradle index 1bfcb48..b7deb1a 100644 --- a/onvif-java/build.gradle +++ b/onvif-java/build.gradle @@ -3,11 +3,21 @@ */ plugins { - id 'org.onvif.java-conventions' - id 'java-test-fixtures' + // id 'org.onvif.java-conventions' + // id 'java-test-fixtures' + id 'java' + id 'java-library' + id("com.github.erdi.webdriver-binaries") version "3.2" +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } repositories { + mavenCentral() maven { url = uri("https://build.shibboleth.net/maven/releases/") // For implementation group: 'org.opensaml', name: 'opensaml-xacml-impl', version: '4.3.0' // url = uri("https://company/com/maven2") @@ -16,36 +26,44 @@ repositories { // uri = uri("https://build.shibboleth.net/maven/releases/org/opensaml/") } -//configurations.all { -// resolutionStrategy { -// force group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '3.0.1' -// } -//} - - -clean.dependsOn(":onvif-ws-client:clean") - -dependencies { - api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.3.2' - api 'org.apache.cxf:cxf-rt-ws-security:3.3.2' - api 'org.apache.cxf:cxf-rt-transports-http:3.3.2' - api project(':onvif-ws-client') - api 'commons-io:commons-io:2.14.0' - api 'commons-codec:commons-codec:1.10' - api 'org.apache.commons:commons-lang3:3.4' - api 'com.sun.xml.messaging.saaj:saaj-impl:1.5.1' - api 'com.sun.activation:javax.activation:1.2.0' - api 'javax.xml.bind:jaxb-api:2.3.1' - api 'com.sun.xml.bind:jaxb-core:2.3.0.1' - api 'com.sun.xml.bind:jaxb-impl:2.3.1' - api testFixtures(project(':onvif-ws-client')) - api testImplementation('org.slf4j:slf4j-simple:1.7.26') - // implementation project(':onvif-ws-client') - // testCompileOnly(testFixtures(project(':onvif-ws-client'))) +tasks.register('xxx', Exec) { + def f = files('../onvif-ws-client/build/libs/onvif-ws-client.jar') + def y = f +} + +clean.dependsOn(":onvif-ws-client:clean") +compileJava.dependsOn(":onvif-ws-client:build") + +dependencies { + implementation 'org.apache.cxf:cxf-rt-frontend-jaxws:3.3.2' + implementation 'org.apache.cxf:cxf-rt-ws-security:3.3.2' + implementation 'org.apache.cxf:cxf-rt-transports-http:3.3.2' + implementation group: 'org.apache.cxf.services.wsn', name: 'cxf-services-wsn-core', version: '3.3.2' + + //implementation files('../onvif-ws-client/build/libs/onvif-ws-client.jar') + // testImplementation files('../onvif-ws-client/build/libs/onvif-ws-client.jar') + implementation project(':onvif-ws-client') + testImplementation project(':onvif-ws-client') + + implementation 'commons-io:commons-io:2.14.0' + implementation 'commons-codec:commons-codec:1.10' + implementation 'org.apache.commons:commons-lang3:3.4' + implementation 'com.sun.xml.messaging.saaj:saaj-impl:1.5.1' + implementation 'com.sun.activation:javax.activation:1.2.0' + implementation 'javax.xml.bind:jaxb-api:2.3.1' + implementation group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' + + implementation group: 'javax.xml.soap', name: 'javax.xml.soap-api', version: '1.4.0' + implementation group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' + // implementation group: 'org.apache.activemq', name: 'activemq-broker', version: '6.1.4' + + + implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1' + implementation 'com.sun.xml.bind:jaxb-impl:2.3.1' + // implementation testFixtures(project(':onvif-ws-client')) + testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' + implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' } -//test { -// useJUnitPlatform() -//} description = 'onvif-java' diff --git a/onvif-ws-client/build.gradle b/onvif-ws-client/build.gradle index 3257e3d..d5cad02 100644 --- a/onvif-ws-client/build.gradle +++ b/onvif-ws-client/build.gradle @@ -3,51 +3,61 @@ */ plugins { - id 'org.onvif.java-conventions' + // id 'org.onvif.java-conventions' id 'java-library' - id("java-test-fixtures") - id 'maven-publish' - id 'java' +// id 'java' +// id("java-test-fixtures") +// id 'maven-publish' id 'com.github.bjornvester.wsdl2java' version '2.0.2' } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() + maven { + url = uri("https://build.shibboleth.net/maven/releases/") // For implementation group: 'org.opensaml', name: 'opensaml-xacml-impl', version: '4.3.0' + // url = uri("https://company/com/maven2") + } + + // uri = uri("https://build.shibboleth.net/maven/releases/org/opensaml/") +} + //sourceCompatibility = "1.8" //targetCompatibility = "1.8" -//configurations.all { -// resolutionStrategy { -// force group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '3.0.1' -// } -//} - dependencies { - api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.3.2' - api 'org.apache.cxf:cxf-rt-transports-http-jetty:3.3.2' - api 'javax.xml.ws:jaxws-api:2.3.1' - api 'javax.jws:javax.jws-api:1.1' - api 'org.apache.cxf.services.wsn:cxf-services-wsn-core:3.3.2' - api 'org.apache.commons:commons-lang3:3.8.1' - api 'org.apache.cxf.xjc-utils:cxf-xjc-runtime:3.3.0' - api 'org.apache.maven:maven-model-builder:3.6.1' + implementation 'org.apache.cxf:cxf-rt-frontend-jaxws:3.3.2' + implementation 'org.apache.cxf:cxf-rt-transports-http-jetty:3.3.2' + implementation 'javax.xml.ws:jaxws-api:2.3.1' + implementation 'javax.jws:javax.jws-api:1.1' + implementation 'org.apache.cxf.services.wsn:cxf-services-wsn-core:3.3.2' + implementation 'org.apache.commons:commons-lang3:3.4' + implementation 'org.apache.cxf.xjc-utils:cxf-xjc-runtime:3.3.0' + implementation 'org.apache.maven:maven-model-builder:3.6.1' // API dependencies are visible to consumers when building - testFixturesApi 'org.apache.commons:commons-lang3:3.9' +// testFixturesApi 'org.apache.commons:commons-lang3:3.9' // Implementation dependencies are not leaked to consumers when building - testFixturesImplementation 'org.apache.commons:commons-text:1.6' +// testFixturesImplementation 'org.apache.commons:commons-text:1.6' } -processResources.dependsOn('compileTestFixturesJava') - .dependsOn(':onvif-ws-client:testFixturesJar') +processResources + // .dependsOn('compileTestFixturesJava') + // .dependsOn(':onvif-ws-client:testFixturesJar') .dependsOn("compileJava") -layout.buildDirectory.set(layout.projectDirectory.dir("build")) + clean { delete("${layout.projectDirectory.dir('src/main/java/org')}") delete("${layout.projectDirectory.dir('src/wsdl/resources/resources/main/classes')}") } - wsdl2java { // layout.buildDirectory = "${projectDir}/onvif-ws-client/src/main/resources/wsdl" verbose.set(true) diff --git a/settings.gradle b/settings.gradle index 8f37c00..2323b84 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,5 +3,4 @@ */ rootProject.name = 'onvif' -include(':onvif-java') -include(':onvif-ws-client') +include 'onvif-java', 'onvif-ws-client'