2.1.3 up.

Contrast-Security-OSS · Apr 1, 2024 · 5330034 · 5330034
1 parent 42c600e
commit 5330034
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/DigicertOne/win.md b/DigicertOne/win.md
@@ -48,8 +48,8 @@
   コマンドプロンプトは管理者として実行で起動してください。
   ```powershell
   cd C:\Program Files (x86)\launch4j\sign4j
-  sign4j.exe java -jar C:\DigiCert\jsign-5.0.jar --keystore "C:\DigiCert\pkcs11properties.cfg" --storetype PKCS11 C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.2.exe
-  sign4j.exe java -jar C:\DigiCert\jsign-5.0.jar --keystore "C:\DigiCert\pkcs11properties.cfg" --storetype PKCS11 C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.2_auditlog.exe
+  sign4j.exe java -jar C:\DigiCert\jsign-5.0.jar --keystore "C:\DigiCert\pkcs11properties.cfg" --storetype PKCS11 C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.3.exe
+  sign4j.exe java -jar C:\DigiCert\jsign-5.0.jar --keystore "C:\DigiCert\pkcs11properties.cfg" --storetype PKCS11 C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.3_auditlog.exe
   ```
   - 電子署名についてはファイルを右クリックのプロパティで確認ができます。
 
diff --git a/README.ja.md b/README.ja.md
@@ -122,7 +122,7 @@ Eclipseでプロジェクトをリフレッシュすると、あとはJavaの実
   launch4jのsign4jを使用します。
   ```powershell
   cd C:\Program Files (x86)\launch4j\sign4j
-  sign4j.exe java -jar jsign-2.0.jar --alias 1 --keystore C:\Users\turbou\Desktop\CSVDLTool_work\XXXXX.pfx --storepass [パスワード] C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.2.exe
+  sign4j.exe java -jar jsign-2.0.jar --alias 1 --keystore C:\Users\turbou\Desktop\CSVDLTool_work\XXXXX.pfx --storepass [パスワード] C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.3.exe
   ```
 - 署名の確認  
   署名の確認については、exeを右クリック->プロパティ で確認できます。
@@ -132,18 +132,18 @@ Eclipseでプロジェクトをリフレッシュすると、あとはJavaの実
   読み込めたら、Common Name(通称)をコピー
 - 署名
   ```bash
-  codesign --deep -s "Contrast Security, Inc." -v CSVDLTool_2.1.2.app
-  codesign --deep -s "Contrast Security, Inc." -v CSVDLTool_2.1.2_auditlog.app
+  codesign --deep -s "Contrast Security, Inc." -v CSVDLTool_2.1.3.app
+  codesign --deep -s "Contrast Security, Inc." -v CSVDLTool_2.1.3_auditlog.app
   ```
 - 署名の確認
   ```bash
-  codesign -d --verbose=4 CSVDLTool_2.1.2.app
-  codesign -d --verbose=4 CSVDLTool_2.1.2_auditlog.app
+  codesign -d --verbose=4 CSVDLTool_2.1.3.app
+  codesign -d --verbose=4 CSVDLTool_2.1.3_auditlog.app
   ```
 
 #### 圧縮について補足
 - macOS
   ```bash
-  7z a CSVDLTool_2.1.2.cli7z CSVDLTool_2.1.2.app/
-  7z a CSVDLTool_2.1.2_auditlog.cli7z CSVDLTool_2.1.2_auditlog.app/
+  7z a CSVDLTool_2.1.3.cli7z CSVDLTool_2.1.3.app/
+  7z a CSVDLTool_2.1.3_auditlog.cli7z CSVDLTool_2.1.3_auditlog.app/
   ```
diff --git a/README.md b/README.md
@@ -120,7 +120,7 @@ First of all, get the certificate file(pfx) and the certificate password.
   Using sign4j in launch4j.  
   ```powershell
   cd C:\Program Files (x86)\launch4j\sign4j
-  sign4j.exe java -jar jsign-2.0.jar --alias 1 --keystore C:\Users\turbou\Desktop\CSVDLTool_work\XXXXX.pfx --storepass [] C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.2.exe
+  sign4j.exe java -jar jsign-2.0.jar --alias 1 --keystore C:\Users\turbou\Desktop\CSVDLTool_work\XXXXX.pfx --storepass [] C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.3.exe
   ```
 - Confirm Digital Signatures  
   You can confirm the signature in the properties of the exe file.
@@ -131,13 +131,13 @@ First of all, get the certificate file(pfx) and the certificate password.
 - Sign  
   Using codesign.  
   ```bash
-  codesign --deep -s "Contrast Security, Inc." -v CSVDLTool_2.1.2.app
-  codesign --deep -s "Contrast Security, Inc." -v CSVDLTool_2.1.2_auditlog.app
+  codesign --deep -s "Contrast Security, Inc." -v CSVDLTool_2.1.3.app
+  codesign --deep -s "Contrast Security, Inc." -v CSVDLTool_2.1.3_auditlog.app
   ```
 - Confirm Digital Signatures
   ```bash
-  codesign -d --verbose=4 CSVDLTool_2.1.2.app
-  codesign -d --verbose=4 CSVDLTool_2.1.2_auditlog.app
+  codesign -d --verbose=4 CSVDLTool_2.1.3.app
+  codesign -d --verbose=4 CSVDLTool_2.1.3_auditlog.app
   ```
 
 #### How to compress
@@ -148,7 +148,7 @@ First of all, get the certificate file(pfx) and the certificate password.
   # Installing p7zip
   brew install p7zip
   # Compress
-  7z a CSVDLTool_2.1.2.cli7z CSVDLTool_2.1.2.app/
-  7z a CSVDLTool_2.1.2_auditlog.cli7z CSVDLTool_2.1.2_auditlog.app/
+  7z a CSVDLTool_2.1.3.cli7z CSVDLTool_2.1.3.app/
+  7z a CSVDLTool_2.1.3_auditlog.cli7z CSVDLTool_2.1.3_auditlog.app/
   ```
 
diff --git a/build.gradle b/build.gradle
@@ -58,7 +58,7 @@ task copyToLib(type: Copy) {
 jar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     archiveBaseName = 'CSVDLTool'
-    archiveVersion = '2.1.2'
+    archiveVersion = '2.1.3'
     exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA' 
     manifest {
         attributes 'Implementation-Title': 'Gradle Quickstart'

diff --git a/jarpackage.sh b/jarpackage.sh
@@ -3,7 +3,7 @@
 JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk1.8.0_231.jdk/Contents/Home"
 BUNDLE_JRE_HOME="/Users/turbou/Downloads/jre1.8.0_202.jre"
 APP_NAME="CSVDLTool"
-APP_VERSION="2.1.2"
+APP_VERSION="2.1.3"
 APP_DIR_NAME="${APP_NAME}_${APP_VERSION}.app"
 
 javapackager \

diff --git a/jarpackage_auditlog.sh b/jarpackage_auditlog.sh
@@ -3,7 +3,7 @@
 JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk1.8.0_231.jdk/Contents/Home"
 BUNDLE_JRE_HOME="/Users/turbou/Downloads/jre1.8.0_202.jre"
 APP_NAME="CSVDLTool"
-APP_VERSION="2.1.2"
+APP_VERSION="2.1.3"
 APP_DIR_NAME="${APP_NAME}_${APP_VERSION}_auditlog.app"
 
 javapackager \

diff --git a/jpackage-aarch64.sh b/jpackage-aarch64.sh
@@ -2,7 +2,7 @@
 
 JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home"
 APP_NAME="CSVDLTool"
-APP_VERSION="2.1.2"
+APP_VERSION="2.1.3"
 SM_KEY_PAIR="key_455812447"
 
 jpackage \

diff --git a/jpackage-x86_64.sh b/jpackage-x86_64.sh
@@ -2,7 +2,7 @@
 
 JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home"
 APP_NAME="CSVDLTool"
-APP_VERSION="2.1.2"
+APP_VERSION="2.1.3"
 SM_KEY_PAIR="key_455812447"
 
 jpackage \

diff --git a/launch4j.xml b/launch4j.xml
@@ -2,8 +2,8 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool-2.1.2.jar</jar>
-  <outfile>C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.2.exe</outfile>
+  <jar>C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool-2.1.3.jar</jar>
+  <outfile>C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.3.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir>.</chdir>

diff --git a/launch4j_auditlog.xml b/launch4j_auditlog.xml
@@ -2,8 +2,8 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool-2.1.2.jar</jar>
-  <outfile>C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.2_auditlog.exe</outfile>
+  <jar>C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool-2.1.3.jar</jar>
+  <outfile>C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.3_auditlog.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir>.</chdir>

diff --git a/sign.txt b/sign.txt
@@ -3,5 +3,5 @@ Enter a [Password]
 Check Arias
 
 cd C:\Program Files (x86)\launch4j\sign4j
-sign4j.exe java -jar jsign-2.0.jar --alias 1 --keystore C:\Users\turbou\Desktop\CSVDLTool_work\contrast-code.pfx --storepass [Password] C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.2.exe
-sign4j.exe java -jar jsign-2.0.jar --alias 1 --keystore C:\Users\turbou\Desktop\CSVDLTool_work\contrast-code.pfx --storepass [Password] C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.2_auditlog.exe
+sign4j.exe java -jar jsign-2.0.jar --alias 1 --keystore C:\Users\turbou\Desktop\CSVDLTool_work\contrast-code.pfx --storepass [Password] C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.3.exe
+sign4j.exe java -jar jsign-2.0.jar --alias 1 --keystore C:\Users\turbou\Desktop\CSVDLTool_work\contrast-code.pfx --storepass [Password] C:\Users\turbou\Desktop\CSVDLTool_work\common\CSVDLTool_2.1.3_auditlog.exe
diff --git a/src/main/java/com/contrastsecurity/csvdltool/preference/AboutPage.java b/src/main/java/com/contrastsecurity/csvdltool/preference/AboutPage.java
@@ -76,7 +76,7 @@ protected Control createContents(Composite parent) {
         Label versionValueLbl = new Label(appGrp, SWT.NONE);
         GridData versionValueLblGrDt = new GridData();
         versionValueLbl.setLayoutData(versionValueLblGrDt);
-        versionValueLbl.setText("2.1.2"); //$NON-NLS-1$
+        versionValueLbl.setText("2.1.3"); //$NON-NLS-1$
 
         Label copyrightLbl = new Label(appGrp, SWT.NONE);
         GridData copyrightLblGrDt = new GridData();

diff --git a/win32_jlink.txt b/win32_jlink.txt
@@ -1,4 +1,4 @@
-jdeps --ignore-missing-deps build\libs\CSVDLTool-2.1.2.jar
+jdeps --ignore-missing-deps build\libs\CSVDLTool-2.1.3.jar
 jlink --compress=2 --module-path "C:\Program Files\Java\jdk-17\jmods" --add-modules java.base,java.desktop,java.logging,java.sql,java.xml,java.management,jdk.crypto.ec,jdk.unsupported --output jre17-min
 
 --add-opens java.base/java.time.format=ALL-UNNAMED