Skip to content

Commit 7a64980

Browse files
dkocherdkocher
authored
Merge pull request #144 from /issues/95-uvf-metadata
Add UVF metadata to root of vault
2 parents 2d8ed8f + 58a0ca2 commit 7a64980

File tree

74 files changed

+2398
-13853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2398
-13853
lines changed

‎hub/pom.xml‎

Lines changed: 134 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -18,57 +18,60 @@
1818
<jwt.version>4.5.0</jwt.version>
1919
<nimbus-jose.version>10.3</nimbus-jose.version>
2020
<swagger-annotations.version>1.6.16</swagger-annotations.version>
21+
22+
<jersey-version>2.37</jersey-version>
23+
<jackson-version>2.19.0</jackson-version>
24+
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
25+
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
2126
</properties>
2227

23-
<profiles>
24-
<profile>
25-
<id>codegen</id>
26-
<build>
27-
<plugins>
28-
<plugin>
29-
<!-- https://openapi-generator.tech/docs/plugins/ -->
30-
<groupId>org.openapitools</groupId>
31-
<artifactId>openapi-generator-maven-plugin</artifactId>
32-
<version>7.14.0</version>
33-
<executions>
34-
<execution>
35-
<goals>
36-
<goal>generate</goal>
37-
</goals>
38-
<configuration>
39-
<!-- https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-maven-plugin/README.md -->
40-
<!-- https://openapi-generator.tech/docs/generators/java/ -->
41-
<inputSpec>${project.basedir}/src/main/resources/openapi.json</inputSpec>
42-
<generatorName>java</generatorName>
43-
<output>${project.basedir}</output>
44-
<modelPackage>cloud.katta.client.model</modelPackage>
45-
<apiPackage>cloud.katta.client.api</apiPackage>
46-
<configOptions>
47-
<sourceFolder>src/main/java</sourceFolder>
48-
<library>jersey2</library>
49-
<dateLibrary>joda</dateLibrary>
50-
<java8>true</java8>
51-
<hideGenerationTimestamp>true</hideGenerationTimestamp>
52-
<!-- workaround for https://github.com/OpenAPITools/openapi-generator/issues/10645 -->
53-
<additionalModelTypeAnnotations>@com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true)
54-
</additionalModelTypeAnnotations>
55-
<useOneOfDiscriminatorLookup>true</useOneOfDiscriminatorLookup>
56-
</configOptions>
57-
<generateApiTests>false</generateApiTests>
58-
<generateModelTests>false</generateModelTests>
59-
<generateSupportingFiles>true</generateSupportingFiles>
60-
<supportingFilesToGenerate>
61-
ApiCallback.java,ApiClient.java,ApiException.java,ApiResponse.java,Configuration.java,Pair.java,ProgressRequestBody.java,ProgressResponseBody.java,StringUtil.java,ApiKeyAuth.java,Authentication.java,HttpBasicAuth.java,JSON.java,OAuth.java,EncodingUtils.java
62-
</supportingFilesToGenerate>
63-
<generateApiDocumentation>false</generateApiDocumentation>
64-
</configuration>
65-
</execution>
66-
</executions>
67-
</plugin>
68-
</plugins>
69-
</build>
70-
</profile>
71-
</profiles>
28+
<build>
29+
<plugins>
30+
<plugin>
31+
<!-- https://openapi-generator.tech/docs/plugins/ -->
32+
<groupId>org.openapitools</groupId>
33+
<artifactId>openapi-generator-maven-plugin</artifactId>
34+
<version>7.14.0</version>
35+
<executions>
36+
<execution>
37+
<phase>process-sources</phase>
38+
<goals>
39+
<goal>generate</goal>
40+
</goals>
41+
<configuration>
42+
<!-- https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-maven-plugin/README.md -->
43+
<!-- https://openapi-generator.tech/docs/generators/java/ -->
44+
<inputSpec>${project.basedir}/src/main/resources/openapi.json</inputSpec>
45+
<generatorName>java</generatorName>
46+
<output>${project.basedir}</output>
47+
<modelPackage>cloud.katta.client.model</modelPackage>
48+
<apiPackage>cloud.katta.client.api</apiPackage>
49+
<configOptions>
50+
<sourceFolder>target/generated-sources/openapi</sourceFolder>
51+
<library>jersey2</library>
52+
<dateLibrary>joda</dateLibrary>
53+
<java8>true</java8>
54+
<hideGenerationTimestamp>true</hideGenerationTimestamp>
55+
<!-- workaround for https://github.com/OpenAPITools/openapi-generator/issues/10645 -->
56+
<additionalModelTypeAnnotations>@com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true)
57+
</additionalModelTypeAnnotations>
58+
<useOneOfDiscriminatorLookup>true</useOneOfDiscriminatorLookup>
59+
</configOptions>
60+
<generateApiTests>false</generateApiTests>
61+
<generateModelTests>false</generateModelTests>
62+
<generateApiDocumentation>false</generateApiDocumentation>
63+
<generateModelDocumentation>false</generateModelDocumentation>
64+
<generateSupportingFiles>true</generateSupportingFiles>
65+
<generateApiDocumentation>false</generateApiDocumentation>
66+
<supportingFilesToGenerate>
67+
ApiCallback.java,ApiClient.java,ApiException.java,ApiResponse.java,Configuration.java,Pair.java,ProgressRequestBody.java,ProgressResponseBody.java,StringUtil.java,ApiKeyAuth.java,Authentication.java,HttpBasicAuth.java,HttpBearerAuth.java,JSON.java,OAuth.java,EncodingUtils.java,RFC3339DateFormat.java,RFC3339JavaTimeModule.java,RFC3339InstantDeserializer.java,AbstractOpenApiSchema.java,ServerConfiguration.java,ServerVariable.java
68+
</supportingFilesToGenerate>
69+
</configuration>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
</plugins>
74+
</build>
7275

7376
<dependencies>
7477
<dependency>
@@ -101,12 +104,6 @@
101104
<artifactId>nimbus-jose-jwt</artifactId>
102105
<version>${nimbus-jose.version}</version>
103106
</dependency>
104-
<dependency>
105-
<!-- used in code generated by openapitools -->
106-
<groupId>org.openapitools</groupId>
107-
<artifactId>jackson-databind-nullable</artifactId>
108-
<version>0.2.6</version>
109-
</dependency>
110107
<dependency>
111108
<groupId>io.swagger</groupId>
112109
<artifactId>swagger-annotations</artifactId>
@@ -129,5 +126,87 @@
129126
<artifactId>testcontainers</artifactId>
130127
<scope>test</scope>
131128
</dependency>
129+
130+
<!-- @Nullable annotation -->
131+
<dependency>
132+
<groupId>com.google.code.findbugs</groupId>
133+
<artifactId>jsr305</artifactId>
134+
<version>3.0.2</version>
135+
</dependency>
136+
137+
<!-- HTTP client: jersey-client -->
138+
<dependency>
139+
<groupId>org.glassfish.jersey.core</groupId>
140+
<artifactId>jersey-client</artifactId>
141+
<version>${jersey-version}</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.glassfish.jersey.inject</groupId>
145+
<artifactId>jersey-hk2</artifactId>
146+
<version>${jersey-version}</version>
147+
</dependency>
148+
<dependency>
149+
<groupId>org.glassfish.jersey.media</groupId>
150+
<artifactId>jersey-media-multipart</artifactId>
151+
<version>${jersey-version}</version>
152+
</dependency>
153+
<dependency>
154+
<groupId>org.glassfish.jersey.media</groupId>
155+
<artifactId>jersey-media-json-jackson</artifactId>
156+
<version>${jersey-version}</version>
157+
</dependency>
158+
159+
<!-- JSON processing: jackson -->
160+
<dependency>
161+
<groupId>com.fasterxml.jackson.core</groupId>
162+
<artifactId>jackson-core</artifactId>
163+
<version>${jackson-version}</version>
164+
</dependency>
165+
<dependency>
166+
<groupId>com.fasterxml.jackson.core</groupId>
167+
<artifactId>jackson-annotations</artifactId>
168+
<version>${jackson-version}</version>
169+
</dependency>
170+
<dependency>
171+
<groupId>com.fasterxml.jackson.core</groupId>
172+
<artifactId>jackson-databind</artifactId>
173+
<version>${jackson-version}</version>
174+
</dependency>
175+
<dependency>
176+
<groupId>org.openapitools</groupId>
177+
<artifactId>jackson-databind-nullable</artifactId>
178+
<version>${jackson-databind-nullable-version}</version>
179+
</dependency>
180+
<dependency>
181+
<groupId>com.fasterxml.jackson.datatype</groupId>
182+
<artifactId>jackson-datatype-joda</artifactId>
183+
<version>${jackson-version}</version>
184+
</dependency>
185+
<dependency>
186+
<groupId>com.fasterxml.jackson.datatype</groupId>
187+
<artifactId>jackson-datatype-jsr310</artifactId>
188+
<version>${jackson-version}</version>
189+
</dependency>
190+
<dependency>
191+
<groupId>com.fasterxml.jackson.dataformat</groupId>
192+
<artifactId>jackson-dataformat-cbor</artifactId>
193+
<version>${jackson-version}</version>
194+
</dependency>
195+
<dependency>
196+
<groupId>com.fasterxml.jackson.module</groupId>
197+
<artifactId>jackson-module-jaxb-annotations</artifactId>
198+
<version>${jackson-version}</version>
199+
</dependency>
200+
<dependency>
201+
<groupId>jakarta.annotation</groupId>
202+
<artifactId>jakarta.annotation-api</artifactId>
203+
<version>${jakarta-annotation-version}</version>
204+
<scope>provided</scope>
205+
</dependency>
206+
<dependency>
207+
<groupId>org.glassfish.jersey.connectors</groupId>
208+
<artifactId>jersey-apache-connector</artifactId>
209+
<version>${jersey-version}</version>
210+
</dependency>
132211
</dependencies>
133212
</project>

0 commit comments

Comments
 (0)