Skip to content

Commit

Permalink
Merge pull request #83 from galasa-dev/jade-platform-more-wrappers-2
Browse files Browse the repository at this point in the history 
Iss2052 - Add platform to more wrappers
  • Loading branch information
@jadecarino
jadecarino authored Nov 28, 2024
2 parents 25d95e6 + d89682a commit dc245d5
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 29 deletions.
2 changes: 1 addition & 1 deletion ...a-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/bnd.bnd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Embed-Dependency: *;scope=compile
error_prone_annotations-2.26.1.jar; lib:=true,\
guava-*.jar; lib:=true,\
j2objc-annotations-3.0.0.jar; lib:=true,\
jsr305-3.0.2.jar; lib:=true,\
jsr305-*.jar; lib:=true,\
okhttp-4.10.0.jar; lib:=true,\
okio-jvm-*.jar; lib:=true,\
kotlin-osgi-bundle-1.7.22.jar; lib:=true,\
Expand Down
35 changes: 35 additions & 0 deletions modules/platform/dev.galasa.platform/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,30 @@ dependencies {
api 'com.github.docker-java:docker-java-core:3.2.14'
api 'com.github.docker-java:docker-java-transport-httpclient5:3.2.14'

api 'com.google.android:annotations:4.1.1.4'

api 'com.google.code.findbugs:jsr305:3.0.2'

api 'com.google.code.gson:gson:2.10.1' // If updating, also update in obr/release.yaml.

api 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'

// api 'com.google.protobuf:protobuf-java:4.28.3' - dangerous. Protobuf versions are all explicit elsewhere right now.
api 'com.google.protobuf:protobuf-javalite:3.25.5'

api 'com.google.guava:guava:33.2.1-jre'

api 'com.ibm.db2.jcc:db2jcc:db2jcc4'

api 'com.ibm.mq:com.ibm.mq.allclient:9.2.3.0'

api 'com.jcraft:jsch:0.1.55'
api 'com.jcraft:jzlib:1.1.3'

api 'com.sun.xml.bind:jaxb-osgi:4.0.5'

api 'com.squareup.okhttp3:okhttp:4.9.2'
api 'com.squareup.okhttp3:logging-interceptor:4.12.0'

api 'com.squareup.okio:okio-jvm:3.0.0'

Expand Down Expand Up @@ -67,6 +78,14 @@ dependencies {
api 'dev.galasa:dev.galasa.wrapping.velocity-engine-core:'+version
api 'dev.galasa:galasa-testharness:0.18.0'

api 'io.gsonfire:gson-fire:1.9.0'

api 'io.kubernetes:client-java:22.0.0'
api 'io.kubernetes:client-java-api:22.0.0'
api 'io.kubernetes:client-java-proto:22.0.0'

api 'io.perfmark:perfmark-api:0.26.0'

// Most bundles before implementing the Platform used 0.6.0 other than dev.galasa.framework.k8s.controller.
// Upgrading all to 0.16.0 by using the Platform.
api 'io.prometheus:simpleclient:0.16.0'
Expand All @@ -77,16 +96,28 @@ dependencies {
api 'io.prometheus:simpleclient_tracer_otel:0.16.0'
api 'io.prometheus:simpleclient_tracer_otel_agent:0.16.0'

api 'io.swagger:swagger-annotations:1.6.14'

api 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.41'

api 'jakarta.activation:jakarta.activation-api:2.1.3'

api 'jakarta.annotation:jakarta.annotation-api:3.0.0'

api 'jakarta.transaction:jakarta.transaction-api:2.0.1'

api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'

api 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'

api 'javax.annotation:javax.annotation-api:1.3.2'

api 'javax.jms:javax.jms-api:2.0.1'

api 'javax.servlet:javax.servlet-api:3.1.0'

api 'javax.transaction:javax.transaction-api:1.3'

api 'javax.validation:validation-api:2.0.1.Final' // If updating, also update in obr/release.yaml.

api 'junit:junit:4.13.1'
Expand Down Expand Up @@ -150,10 +181,14 @@ dependencies {

api 'org.awaitility:awaitility:3.0.0'

api 'org.bitbucket.b_c:jose4j:0.9.6'

api 'org.bouncycastle:bcpkix-jdk18on:1.79'
api 'org.bouncycastle:bcprov-jdk18on:1.79'
api 'org.bouncycastle:bcutil-jdk18on:1.79'

api 'org.codehaus.mojo:animal-sniffer-annotations:1.23'

api 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.4.0'

api 'org.junit.jupiter:junit-jupiter:5.10.2'
Expand Down
2 changes: 0 additions & 2 deletions modules/wrapping/dev.galasa.wrapping.com.jcraft.jsch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jzlib</artifactId>
<version>1.1.3</version>
</dependency>
</dependencies>

Expand Down
8 changes: 1 addition & 7 deletions modules/wrapping/dev.galasa.wrapping.io.grpc.java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId>
<version>3.25.5</version>
</dependency>


Expand All @@ -117,7 +116,6 @@
<dependency>
<groupId>com.google.android</groupId>
<artifactId>annotations</artifactId>
<version>4.1.1.4</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand All @@ -127,7 +125,6 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand All @@ -148,12 +145,10 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
<version>9999.0-empty-to-avoid-conflict-with-guava</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>com.google.j2objc</groupId>
Expand All @@ -172,7 +167,6 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<version>1.23</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -206,4 +200,4 @@
</plugins>
</build>

</project>
</project>
18 changes: 1 addition & 17 deletions modules/wrapping/dev.galasa.wrapping.io.kubernetes.client-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,16 @@
<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
<version>22.0.0</version>
</dependency>

<!-- Direct dependencies of client-java -->
<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java-api</artifactId>
<version>22.0.0</version>
</dependency>
<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java-proto</artifactId>
<version>22.0.0</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand All @@ -51,7 +48,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.17.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand All @@ -66,7 +62,6 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.79</version>
</dependency>
<dependency>
<groupId>dev.galasa</groupId>
Expand All @@ -76,29 +71,24 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>0.9.6</version>
</dependency>

<!-- Transitive dependencies -->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.14</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
Expand All @@ -123,7 +113,6 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>4.12.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -143,27 +132,22 @@
<dependency>
<groupId>io.gsonfire</groupId>
<artifactId>gson-fire</artifactId>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.79</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
<version>1.79</version>
</dependency>
<dependency>
<groupId>dev.galasa</groupId>
Expand Down Expand Up @@ -215,4 +199,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 0 additions & 2 deletions modules/wrapping/dev.galasa.wrapping.jta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.transaction/javax.transaction-api -->
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.3</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit dc245d5

Please sign in to comment.