Skip to content

Commit

Permalink
Merge to main
Browse files Browse the repository at this point in the history
  • Loading branch information
@cody-constine-ttd
cody-constine-ttd committed Nov 5, 2024
2 parents 7d58642 + 2d2a940 commit 556dc85
Show file tree
Hide file tree
Showing 20 changed files with 286 additions and 156 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-publish.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ on:
- CRITICAL (DO NOT use if JIRA ticket not raised)
publish_to_maven:
description: 'True to publish the artifacts to Maven repository, false to skip the step'
default: false
default: true
required: false
type: boolean
java_version:
type: string
default: '11'
default: '21'
publish_vulnerabilities:
type: string
default: 'true'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-and-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ on: [pull_request, push, workflow_dispatch]
jobs:
build:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
with:
java_version: "21"
secrets: inherit
70 changes: 43 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.uid2</groupId>
<artifactId>uid2-shared</artifactId>
<version>7.17.9-alpha-142-SNAPSHOT</version>
<version>7.20.0</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>Library for all the shared uid2 operations</description>
<url>https://github.com/IABTechLab/uid2docs</url>
Expand Down Expand Up @@ -37,8 +36,17 @@
<repository>
<id>snapshots-repo</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>
<distributionManagement>
Expand Down Expand Up @@ -67,7 +75,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.20.69</version>
<version>2.27.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -78,14 +86,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-sdk-bom</artifactId>
<version>1.2.26</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.uid2</groupId>
<artifactId>uid2-attestation-api</artifactId>
<version>2.0.0-f968aec0e3</version>
<version>2.1.6</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
Expand Down Expand Up @@ -131,17 +146,17 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.3.12</version>
<version>1.5.6</version>
</dependency>
<dependency>
<groupId>com.github.loki4j</groupId>
<artifactId>loki-logback-appender</artifactId>
<version>1.2.0</version>
<version>1.5.1</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.1.7</version>
<version>3.1.8</version>
</dependency>
<dependency>
<groupId>org.hashids</groupId>
Expand All @@ -151,17 +166,17 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.12.701</version>
<version>1.12.765</version>
</dependency>
<dependency> <!--Needs to be on classpath for roles to work-->
<dependency> <!--Needs to be on classpath for roles to work-->
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<version>1.12.364</version>
<version>1.12.765</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>2.1.1</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
Expand All @@ -171,7 +186,7 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.14.0</version>
<version>1.23.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
Expand All @@ -180,12 +195,10 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-attestation</artifactId>
<version>1.1.15</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>co.nstant.in</groupId>
Expand All @@ -195,12 +208,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.7.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<version>1.18.34</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -239,20 +252,20 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>5.2.0</version>
<artifactId>mockito-core</artifactId>
<version>5.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.10.0</version>
<version>5.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.25.2</version>
<version>3.26.3</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -264,19 +277,22 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>11</source>
<target>11</target>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<configuration>
<argLine>-XX:+EnableDynamicAgentLoading</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down Expand Up @@ -343,7 +359,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.12</version>
<executions>
<execution>
<goals>
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/uid2/shared/attest/AttestationResponseCode.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.uid2.shared.attest;

public enum AttestationResponseCode {
AttestationFailure,
RetryableFailure,
Success
}
Loading

0 comments on commit 556dc85

Please sign in to comment.