Skip to content

Commit

Permalink
Updated files for version 1.0.4:
Browse files Browse the repository at this point in the history
- updated tsm-rest-api to be compliant to BSI-TR-03165 TSMS v1.0.4
- version v1.0.4 of tsm-api was created, even through it is identical to v1.0.1, to maintain consistent version numbering across BSI-TR-03164, tsm-api and tsm-rest-api.
  • Loading branch information
a1608 committed Jul 7, 2023
1 parent 09b937e commit 764f218
Show file tree
Hide file tree
Showing 40 changed files with 12,808 additions and 356 deletions.
4 changes: 4 additions & 0 deletions tsm-api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
Changelog file for BSI tsm-api.

## [1.0.4] - 07.07.2023
* the version of tsm-api (v1.0.4) is identical to v1.0.3, as there were no differences in the TSM-API specifications between BSI-TR-03165 v1.0.3 and v1.0.4
* the version number (v1.0.4) was only created to maintain consistency across BSI-TR-03165, tsm-api, and tsm-rest-api.

## [1.0.3] - 26.05.2023
* renamed method setCustomAccessToken to setAccessToken and added callback strategy for token creation

Expand Down
6 changes: 3 additions & 3 deletions tsm-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ Installing JavaCard applets on a secure component of a smartphone is step three

The resulting build artifacts of this module are:

* **[tsm-api-1.0.3.jar](dist/1.0.3/tsm-api-1.0.3.jar)**
* **[tsm-api-1.0.4.jar](dist/1.0.4/tsm-api-1.0.4.jar)**
* can be included into an Android app to use a TSMS by calling TSM-API methods
* provide default implementations for all data types required by the TSM-API
* can be used to implement a TSM-API-SDK according to BSI-TR-03165
* **[tsm-api-1.0.3-javadoc.jar](dist/1.0.3/tsm-api-1.0.3-javadoc.jar)**
* **[tsm-api-1.0.4-javadoc.jar](dist/1.0.4/tsm-api-1.0.4-javadoc.jar)**
* JavaDoc documentation of the TSM-API interfaces, enums and classes
* **[tsm-api-1.0.3-sources.jar](dist/1.0.3/tsm-api-1.0.3-sources.jar)**
* **[tsm-api-1.0.4-sources.jar](dist/1.0.4/tsm-api-1.0.4-sources.jar)**
* source code of the TSM-API


Expand Down
30 changes: 30 additions & 0 deletions tsm-api/dist/1.0.4/changelog-tsm-api-1.0.4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Changelog
Changelog file for BSI tsm-api.

## [1.0.4] - 07.07.2023
* the version of tsm-api (v1.0.4) is identical to v1.0.3, as there were no differences in the TSM-API specifications between BSI-TR-03165 v1.0.3 and v1.0.4
* the version number (v1.0.4) was only created to maintain consistency across BSI-TR-03165, tsm-api, and tsm-rest-api.

## [1.0.3] - 26.05.2023
* renamed method setCustomAccessToken to setAccessToken and added callback strategy for token creation

## [1.0.2] - 05.04.2023
* the version of tsm-api (v1.0.2) is identical to v1.0.1, as there were no differences in the TSM-API specifications between BSI-TR-03165 v1.0.1 and v1.0.2
* the version number (v1.0.2) was only created to maintain consistency across BSI-TR-03165, tsm-api, and tsm-rest-api.

## [1.0.1] - 14.02.2023
* modifications to be compliant to BSI TR-03165 v1.0.1:
* added new method setCustomAccessToken
* EErrorTypes: renamed INVALID_REQUEST to INVALID_ARGUMENT
* EErrorTypes: renamed CONTENT_RELATED_ERROR to SECURE_COMPONENT_ERROR
* EErrorTypes: renamed INVALID_STATE to NOT_ALLOWED
* EErrorTypes: added new error types ALREADY_EXISTS, UNAUTHORIZED, ISSUER_ERROR, NOT_FOUND, OVERLOAD_PROTECTION, UNDER_MAINTENANCE
* changed maven groupId and java package from de.bsi.tsms to de.bund.bsi.tsms
* corrected spell issues
* updated maven plugins to latest stable versions

## [1.0.0] - 07.06.2022
* created project
* compliant to BSI TR-03165 v1.0


Binary file added tsm-api/dist/1.0.4/tsm-api-1.0.4-javadoc.jar
Binary file not shown.
Binary file added tsm-api/dist/1.0.4/tsm-api-1.0.4-sources.jar
Binary file not shown.
Binary file added tsm-api/dist/1.0.4/tsm-api-1.0.4.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion tsm-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.bund.bsi.tsms</groupId>
<artifactId>tsm-api</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>

<name>TSM-API</name>
<description>The TSM-API is a Java realization of the TSM-API interface specified in BSI-TR-03165. This interface offers methods to install and remove JavaCard applets on eSEs (embedded Secure Elements) or eSIMs.</description>
Expand Down
8 changes: 8 additions & 0 deletions tsm-rest-api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Changelog
Changelog file for BSI tsm-rest-api.

## [1.0.4] - 07.07.2023
* modifications to be compliant to BSI TR-03165 v1.0.4:
* PersonalizationConfig: added attribute certificateId and removed it from PersonalizationScript
* corrected URL in 4.1.6.5.10 for method list related flavors from /services/{serviceId}/executable-load-files/{elfId}/flavors to /executable-load-files/{elfId}/services/{serviceId}/flavors (#264)
* corrected URL in 4.1.6.5.12 for method list related versions from /executable-load-files/{elfId}/services/{servideId}/versions to /executable-load-files/{elfId}/services/{serviceId}/versions (#264)
* changed media type "application/octed-data" to "application/octed-stream" (#266)


## [1.0.3] - 26.05.2023
* modifications to be compliant to BSI TR-03165 v1.0.3:
* applicationConfig: changed installConfig from "Mandatory" to "Optional" (#235)
Expand Down
26 changes: 13 additions & 13 deletions tsm-rest-api/README.md

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions tsm-rest-api/dist/1.0.4/changelog-tsm-rest-api-1.0.4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Changelog
Changelog file for BSI tsm-rest-api.

## [1.0.4] - 07.07.2023
* modifications to be compliant to BSI TR-03165 v1.0.4:
* PersonalizationConfig: added attribute certificateId and removed it from PersonalizationScript
* corrected URL in 4.1.6.5.10 for method list related flavors from /services/{serviceId}/executable-load-files/{elfId}/flavors to /executable-load-files/{elfId}/services/{serviceId}/flavors (#264)
* corrected URL in 4.1.6.5.12 for method list related versions from /executable-load-files/{elfId}/services/{servideId}/versions to /executable-load-files/{elfId}/services/{serviceId}/versions (#264)
* changed media type "application/octed-data" to "application/octed-stream" (#266)


## [1.0.3] - 26.05.2023
* modifications to be compliant to BSI TR-03165 v1.0.3:
* applicationConfig: changed installConfig from "Mandatory" to "Optional" (#235)
* widened scope of Error Category 1002
* changed API method parameter in linkSecureComponentProfiles from Map<string,string[]> to Map<string,string> (#240)
* changed parameters spId, serviceId, elfId, certificateId from "Mandatory" to "Optional" (#242)
* removed discriminator from ExecutableLoadFile (#232)
* removed pattern restriction for SecureComponentProfile#osVersion (#234)
* REST-API methods using ExecutableLoadFile should support Polymorphism (and should accept CAP). Affected methods (#232):
* GET /secure-component-profiles/{scpId}/elfs
* GET /services/{serviceId}/flavors/{flavorId}/executable-load-files:
* GET /executable-load-files
* POST /executable-load-files
* GET /executable-load-files/{elfId}
* PUT /executable-load-files/{elfId}

## [1.0.2] - 05.04.2023
* modifications to be compliant to BSI TR-03165 v1.0.2:
* renamed attribute cspFull to useCSPFull of FeatureConfig
* added new attribute keyProvisioningMode to FeatureConfig
* added new attribute keyIndex to FeatureConfig
* renamed attribute includeKeyDiversificationData to includeSecurityDomainDiversificationData of PersonalizationConfig
* added new attribute spId to Service, ELF, ApplicationConfig, PersonalizationScript, Certificate and SposConfig
* added new attribute serviceId to Version and Flavor
* added new attribute elfId to EM
* added new attribute certificateId to ApplicationConfig
* changed maven groupId from de.bsi.tsms to de.bund.bsi.tsms
* changed java package from de.bsi.tsms to de.bund.bsi.tsms
* corrected spell issues
* changed jackson-databind dependency in yaml2json/pom.xml from 2.9.5 to [2.12.6.1,) to address GitHub dependency alerts

## [1.0.0] - 07.06.2022
* created project
* compliant to BSI TR-03165 v1.0


Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<groupId>de.bund.bsi.tsms.tsm-rest-api</groupId>
<artifactId>generate-java-client</artifactId>
<version>1.0.4</version>
<packaging>pom</packaging>

<build>
<plugins>
<!-- clean up -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<filesets>
<!-- remove java-client -->
<fileset>
<directory>${dest}</directory>
<includes>
<include>**</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>

<!-- generate java-client -->
<plugin>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
<version>3.0.36</version>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<!-- specify the swagger yaml -->
<inputSpec>${yaml}</inputSpec>

<!-- target to generate java client code -->
<language>java</language>
<addCompileSourceRoot>true</addCompileSourceRoot>
<invokerPackage>de.bund.bsi.tsms.tsmrestapi</invokerPackage>
<modelPackage>de.bund.bsi.tsms.tsmrestapi.model</modelPackage>
<apiPackage>de.bund.bsi.tsms.tsmrestapi.api</apiPackage>
<withXml>false</withXml>
<output>${dest}</output>
<groupId>de.bund.bsi.tsms.tsm-rest-api</groupId>
<artifactId>java-client</artifactId>
<artifactVersion>${project.version}</artifactVersion>

<!-- hint: if you want to generate java server code, e.g. based on Spring Boot,
you can use the following target: <language>spring</language> -->

<!-- pass any necessary config options -->
<configOptions>
<dateLibrary>joda</dateLibrary>
</configOptions>

<!-- override the default library to jersey2 -->
<library>jersey2</library>
</configuration>
</execution>
</executions>
</plugin>

<!-- modify java-client/pom.xml via regex -->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<version>1.4.1</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>${dest}/pom.xml</file>
<regex>true</regex>
<replacements>
<replacement>
<token><![CDATA[<artifactId>build-helper-maven-plugin</artifactId>
<executions>]]></token>
<value><![CDATA[
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<executions>
]]></value>
</replacement>
<replacement>
<token><![CDATA[<artifactId>maven-javadoc-plugin</artifactId>.*<version>3.2.0</version>
<executions>]]></token>
<value><![CDATA[
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<source>8</source>
</configuration>
<executions>
]]></value>
</replacement>
<replacement>
<token><![CDATA[<prerequisites>.*<maven>2.2.0</maven>.*</prerequisites>]]></token>
<value></value>
</replacement>
<replacement>
<token><![CDATA[<properties>
<swagger-core-version>2.0.0</swagger-core-version>]]></token>
<value><![CDATA[
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>2.0.0</swagger-core-version>
]]></value>
</replacement>
</replacements>
<regexFlags>
<regexFlag>CASE_INSENSITIVE</regexFlag>
<regexFlag>MULTILINE</regexFlag>
<regexFlag>DOTALL</regexFlag>
</regexFlags>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<!-- dependencies are needed for the client being generated -->

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-v3-version}</version>
</dependency>

<!-- You can find the dependencies for the library configuration you chose by looking in JavaClientCodegen.
Then find the corresponding dependency on Maven Central, and set the versions in the property section below -->

<!-- HTTP client: jersey-client -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey-version}</version>
</dependency>

<!-- JSON processing: jackson -->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>

<!-- Joda time: if you use it -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime-version}</version>
</dependency>

<!-- Base64 encoding that works in both JVM and Android -->
<dependency>
<groupId>com.brsanthu</groupId>
<artifactId>migbase64</artifactId>
<version>2.2</version>
</dependency>
</dependencies>

<properties>
<java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<swagger-annotations-version>1.6.9</swagger-annotations-version>
<swagger-annotations-v3-version>2.2.8</swagger-annotations-v3-version>
<jersey-version>2.38</jersey-version>
<jackson-version>2.14.2</jackson-version>
<jodatime-version>2.12.2</jodatime-version>
<junit-version>4.13.2</junit-version>

<yaml>tsm-rest-api-1.0.4.yaml</yaml>
<dest>java-client</dest>
</properties>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@echo off

echo.
echo ############################
echo ### generate java-client ###
echo ############################
echo.

set MAVEN_OPTS=--add-opens=java.base/java.util=ALL-UNNAMED
call mvn -f generate-tsm-rest-api-java-client-1.0.4-pom.xml clean install

echo.
pause
Binary file not shown.
Loading

0 comments on commit 764f218

Please sign in to comment.