Skip to content

Commit

Permalink
Set the next version to 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ebourg committed Jun 11, 2024
1 parent a58e46f commit 8b13cbe
Show file tree
Hide file tree
Showing 40 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ See https://ebourg.github.io/jsign for more information.

## Changes

#### Version 6.1 (in development)
#### Version 7.0 (in development)

* The Azure Trusted Signing service has been integrated
* The Oracle Cloud signing service has been integrated
Expand Down
4 changes: 2 additions & 2 deletions jsign-ant/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>net.jsign</groupId>
<artifactId>jsign-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Jsign - Authenticode signing in Java (Ant Task)</name>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion jsign-ant/src/main/java/net/jsign/AntLogHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* Console implementation for Ant tasks.
*
* @since 6.1
* @since 7.0
*/
class AntLogHandler extends Handler {

Expand Down
4 changes: 2 additions & 2 deletions jsign-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>net.jsign</groupId>
<artifactId>jsign-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Jsign - Authenticode signing in Java (Command Line Tool)</name>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion jsign-cli/src/main/java/net/jsign/DirectoryScanner.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/**
* Scans a directory recursively and returns the files matching a pattern.
*
* @since 6.1
* @since 7.0
*/
class DirectoryScanner {

Expand Down
4 changes: 2 additions & 2 deletions jsign-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>net.jsign</groupId>
<artifactId>jsign-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Jsign - Authenticode signing in Java (Core)</name>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jsign-core/src/main/java/net/jsign/Signable.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public interface Signable extends Closeable {
* @param digestAlgorithm the digest algorithm to use
* @return the ContentInfo or EncapsulatedContentInfo structure
* @throws IOException if an I/O error occurs
* @since 6.1
* @since 7.0
*/
default CMSTypedData createSignedContent(DigestAlgorithm digestAlgorithm) throws IOException {
return new PKCS7ProcessableObject(AuthenticodeObjectIdentifiers.SPC_INDIRECT_DATA_OBJID, createIndirectData(digestAlgorithm));
Expand Down Expand Up @@ -105,7 +105,7 @@ default byte[] computeDigest(DigestAlgorithm digestAlgorithm) throws IOException
* @param certificate the certificate to validate
* @throws IOException if an I/O error occurs
* @throws IllegalArgumentException if the certificate doesn't match the publisher identity
* @since 6.1
* @since 7.0
*/
default void validate(Certificate certificate) throws IOException, IllegalArgumentException {
}
Expand Down
2 changes: 1 addition & 1 deletion jsign-core/src/main/java/net/jsign/SignatureUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/**
* Helper class for working with signatures.
*
* @since 6.1
* @since 7.0
*/
public class SignatureUtils {

Expand Down
2 changes: 1 addition & 1 deletion jsign-core/src/main/java/net/jsign/StdOutLogHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* Log handler for the command line tool.
*
* @since 6.1
* @since 7.0
*/
class StdOutLogHandler extends Handler {

Expand Down
2 changes: 1 addition & 1 deletion jsign-core/src/main/java/net/jsign/nuget/NugetFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
* @see <a href="https://github.com/NuGet/Home/wiki/Package-Signatures-Technical-Details">NuGet Package Signatures Technical Specification</a>
*
* @author Sebastian Stamm
* @since 6.1
* @since 7.0
*/
public class NugetFile extends ZipFile implements Signable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for APPX files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices(SignableProvider.class)
public class APPXSignableProvider extends ExtensionBasedSignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for Catalog files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices
public class CatalogSignableProvider implements SignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* {@link SignableProvider} for files matching a specific extension.
*
* @since 6.1
* @since 7.0
*/
public abstract class ExtensionBasedSignableProvider implements SignableProvider {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for JScript files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices(SignableProvider.class)
public class JScriptSignableProvider extends ExtensionBasedSignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for Microsoft Cabinet files
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices
public class MSCabinetSignableProvider implements SignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for MSI files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices
public class MSISignableProvider implements SignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for NAVX files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices
public class NAVXSignableProvider implements SignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for NuGet files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices(SignableProvider.class)
public class NugetSignableProvider extends ExtensionBasedSignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for Portable Executable files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices
public class PESignableProvider implements SignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for PowerShell scripts.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices(SignableProvider.class)
public class PowerShellSignableProvider extends ExtensionBasedSignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for PowerShell XML files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices(SignableProvider.class)
public class PowerShellXMLSignableProvider extends ExtensionBasedSignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/**
* Service Provider Interface for {@link Signable} implementations
*
* @since 6.1
* @since 7.0
*/
public interface SignableProvider {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for VBScript files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices(SignableProvider.class)
public class VBScriptSignableProvider extends ExtensionBasedSignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* {@link SignableProvider} for Windows Script files.
*
* @since 6.1
* @since 7.0
*/
@MetaInfServices(SignableProvider.class)
public class WindowsScriptSignableProvider extends ExtensionBasedSignableProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public void removeEntry(String name) {
* Returns the size of the specified entry (local header + compressed data).
*
* @param name the name of the entry
* @since 6.1
* @since 7.0
*/
public long getEntrySize(String name) {
CentralDirectoryFileHeader centralDirectoryFileHeader = entries.get(name);
Expand Down
4 changes: 2 additions & 2 deletions jsign-crypto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>net.jsign</groupId>
<artifactId>jsign-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Jsign - Authenticode signing in Java (Crypto)</name>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
12 changes: 6 additions & 6 deletions jsign-crypto/src/main/java/net/jsign/CertificateUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static Comparator<X509Certificate> getChainComparator() {
/**
* Returns the authority information access extension of the specified certificate.
*
* @since 6.1
* @since 7.0
*/
public static AuthorityInformationAccess getAuthorityInformationAccess(X509Certificate certificate) {
byte[] aia = certificate.getExtensionValue(Extension.authorityInfoAccess.getId());
Expand All @@ -86,7 +86,7 @@ public static AuthorityInformationAccess getAuthorityInformationAccess(X509Certi
/**
* Returns the issuer certificate URL of the specified certificate.
*
* @since 6.1
* @since 7.0
*/
public static String getIssuerCertificateURL(X509Certificate certificate) {
AuthorityInformationAccess aia = getAuthorityInformationAccess(certificate);
Expand All @@ -105,7 +105,7 @@ public static String getIssuerCertificateURL(X509Certificate certificate) {
* Returns the issuer certificates of the specified certificate. Multiple issuer certificates may be returned
* if the certificate is cross-signed.
*
* @since 6.1
* @since 7.0
*/
public static Collection<X509Certificate> getIssuerCertificates(X509Certificate certificate) throws IOException, CertificateException {
String certificateURL = getIssuerCertificateURL(certificate);
Expand All @@ -124,7 +124,7 @@ public static Collection<X509Certificate> getIssuerCertificates(X509Certificate
/**
* Returns the certificate chain of the specified certificate up to the specified depth.
*
* @since 6.1
* @since 7.0
*/
public static Collection<X509Certificate> getCertificateChain(X509Certificate certificate, int maxDepth) {
List<X509Certificate> chain = new ArrayList<>();
Expand All @@ -147,7 +147,7 @@ public static Collection<X509Certificate> getCertificateChain(X509Certificate ce
/**
* Tells if the specified certificate is self-signed.
*
* @since 6.1
* @since 7.0
*/
public static boolean isSelfSigned(X509Certificate certificate) {
return certificate.getSubjectDN().equals(certificate.getIssuerDN());
Expand All @@ -156,7 +156,7 @@ public static boolean isSelfSigned(X509Certificate certificate) {
/**
* Completes the specified chain with the missing issuer certificates.
*
* @since 6.1
* @since 7.0
*/
public static List<X509Certificate> getFullCertificateChain(Collection<X509Certificate> chain) {
Set<String> issuerNames = chain.stream().map(c -> c.getIssuerX500Principal().getName()).collect(Collectors.toSet());
Expand Down
2 changes: 1 addition & 1 deletion jsign-crypto/src/main/java/net/jsign/HttpClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/**
* Simple HTTP client with resource caching.
*
* @since 6.1
* @since 7.0
*/
class HttpClient {

Expand Down
2 changes: 1 addition & 1 deletion jsign-crypto/src/main/java/net/jsign/OSUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* Helper class to retrieve information about the operating system.
*
* @since 6.1
* @since 7.0
*/
class OSUtils {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/**
* Signing service using the Azure Trusted Signing API.
*
* @since 6.1
* @since 7.0
*/
public class AzureTrustedSigningService implements SigningService {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/**
* Credentials for the Garantir Remote Signing service.
*
* @since 6.1
* @since 7.0
*/
public class GaraSignCredentials {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/**
* Signing service using the Garantir Remote Signing REST Service API.
*
* @since 6.1
* @since 7.0
*/
public class GaraSignSigningService implements SigningService {

Expand Down
2 changes: 1 addition & 1 deletion jsign-crypto/src/main/java/net/jsign/jca/JsonWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* Simple JSON formatter.
*
* @since 6.1
* @since 7.0
*/
class JsonWriter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/**
* Oracle Cloud credentials loaded from the <code>.oci/config</code> file or from the environment variables.
*
* @since 6.1
* @since 7.0
*/
public class OracleCloudCredentials {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
/**
* Signing service using the Oracle Cloud API.
*
* @since 6.1
* @since 7.0
*/
public class OracleCloudSigningService implements SigningService {

Expand Down
Loading

0 comments on commit 8b13cbe

Please sign in to comment.