Skip to content

merge back master to develop #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

merge back master to develop #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e28137
Update maintainer info
matthijsgeers-keysight Dec 4, 2024
3c58111
Bump to release version
matthijsgeers-keysight Dec 4, 2024
4f110eb
Merge pull request #67 from Keysight/release/2.2.6
Siebje Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This library is available on Maven Central. Use the following information to inc
<dependency>
<groupId>com.riscure</groupId>
<artifactId>trsfile</artifactId>
<version>2.2.5</version>
<version>2.2.6</version>
</dependency>

#### Basic
Expand Down
15 changes: 8 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@

<groupId>com.riscure</groupId>
<artifactId>trsfile</artifactId>
<version>2.2.6-SNAPSHOT</version>
<version>2.2.6</version>
<packaging>jar</packaging>

<name>${project.groupId}:${project.artifactId}</name>
<description>Inspector Trace Set `.trs` file support for Java.
Riscure Inspector uses the `.trs` file format to save and read traces from disk. To better assist reading and
writing trace set files from third parties, Riscure published this Java library.
Keysight Inspector uses the `.trs` file format to save and read traces from disk. To better assist reading and
writing trace set files from third parties, Keysight manages this Java library. Note that the library was
originally published by Riscure, which was acquired by Keysight in 2024.
</description>
<url>https://github.com/Riscure/java-trsfile</url>
<url>https://github.com/Keysight/java-trsfile</url>
<licenses>
<license>
<name>BSD 3-Clause Clear License</name>
Expand All @@ -23,9 +24,9 @@
</licenses>
<developers>
<developer>
<name>Riscure Team</name>
<organization>Riscure</organization>
<organizationUrl>https://www.riscure.com</organizationUrl>
<name>Riscure Security Solutions</name>
<organization>Keysight Technologies</organization>
<organizationUrl>https://www.keysight.com</organizationUrl>
</developer>
</developers>
<scm>
Expand Down
Loading