summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BKUCertificates/pom.xml2
-rw-r--r--BKUCertificates/src/main/changes/changes.txt25
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_g2_ca.cer25
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1k.cer30
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1m_sha2.cer30
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/entrust_g2_ca.cer25
-rw-r--r--BKUCommonGUI/pom.xml2
-rw-r--r--BKUFonts/pom.xml2
-rw-r--r--BKUGuiExt/pom.xml2
-rw-r--r--BKUHelp/pom.xml2
-rw-r--r--BKUHelpWebStart/pom.xml2
-rw-r--r--BKULocal/pom.xml2
-rw-r--r--BKUViewer/pom.xml2
-rw-r--r--BKUWebStart/pom.xml2
-rw-r--r--STAL/pom.xml2
-rw-r--r--STALExt/pom.xml2
-rw-r--r--STALService/pom.xml2
-rw-r--r--STALXService/pom.xml2
-rw-r--r--bkucommon/pom.xml2
-rw-r--r--pom.xml6
-rw-r--r--smcc/pom.xml2
-rw-r--r--smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre6.libosxj2pcsc.dylibbin39484 -> 0 bytes
-rw-r--r--smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre7.libosxj2pcsc.dylibbin14908 -> 0 bytes
-rw-r--r--smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre8.libosxj2pcsc.dylibbin14964 -> 0 bytes
-rw-r--r--smccSTAL/pom.xml2
-rw-r--r--smccSTALExt/pom.xml2
-rw-r--r--utils/pom.xml2
-rw-r--r--utils/src/main/java/at/gv/egiz/updater/Constants.java12
-rw-r--r--utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java21
-rw-r--r--utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java2
30 files changed, 179 insertions, 33 deletions
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 4082dcd5..2866dcb6 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUCertificates</artifactId>
<!-- DON'T CHANGE VERSION UNLESS THE INCLUDED CERTIFICATES CHANGED
diff --git a/BKUCertificates/src/main/changes/changes.txt b/BKUCertificates/src/main/changes/changes.txt
index a64980d3..31abe0d5 100644
--- a/BKUCertificates/src/main/changes/changes.txt
+++ b/BKUCertificates/src/main/changes/changes.txt
@@ -4,6 +4,31 @@ Tags:
* ''ADDED'' ... certificate newly added in this release
* ''REMOVED'' ... certificate removed in this release
* TRUSTED ... certificate included in truststore
+
+-------------------
+'''BKUCertificates-1.18 (mocca-1.4.3)'''
+-------------------
+Entrust G2 CA (''ADDED'', TRUSTED)
+* Serial Number: 4a538c28
+* Issuer: CN = Entrust Root Certification Authority - G2
+* Subject: CN = Entrust Root Certification Authority - G2
+* Not Before: ‎‎Dienstag, ‎7. ‎Juli ‎2009 19:25:54
+* Not After: ‎Samstag, ‎7. ‎Dezember ‎2030 19:55:54
+
+Entrust L1K (''ADDED'')
+* Serial Number: 0ee94cc30000000051d37785
+* Issuer: CN = Entrust Root Certification Authority - G2
+* Subject: CN = Entrust Certification Authoritiy - L1K
+* Not Before: ‎Montag, ‎5. ‎Oktober ‎2015 21:13:56
+* Not After: ‎Donnerstag, ‎5. ‎Dezember ‎2030 21:43:56
+
+Entrust L1M (''ADDED'')
+* Serial Number: 61a1e7d20000000051d366a6
+* Issuer: CN = Entrust Root Certification Authority - G2
+* Subject: CN = Entrust Certification Authoritiy - L1M
+* Not Before: Montag, ‎15. ‎Dezember ‎2014 17:25:03
+* Not After: ‎‎Dienstag, ‎15. ‎Oktober ‎2030 17:55:03
+
-------------------
'''BKUCertificates-1.16 (mocca-1.4.1)'''
-------------------
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_g2_ca.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_g2_ca.cer
new file mode 100644
index 00000000..2e23a605
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_g2_ca.cer
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
+cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
+IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
+dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
+NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
+dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
+dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
+aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
+RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
+cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
+wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
+U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
+jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
+BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
+jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
+1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
+nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
+VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
+-----END CERTIFICATE-----
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1k.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1k.cer
new file mode 100644
index 00000000..5586a64e
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1k.cer
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFDjCCA/agAwIBAgIMDulMwwAAAABR03eFMA0GCSqGSIb3DQEBCwUAMIG+MQsw
+CQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2Vl
+IHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMDkg
+RW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTIwMAYDVQQD
+EylFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjAeFw0x
+NTEwMDUxOTEzNTZaFw0zMDEyMDUxOTQzNTZaMIG6MQswCQYDVQQGEwJVUzEWMBQG
+A1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5l
+dC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAt
+IGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gTDFLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA2j+W0E25L0Tn2zlem1DuXKVh2kFnUwmqAJqOV38pa9vH4SEkqjrQ
+jUcj0u1yFvCRIdJdt7hLqIOPt5EyaM/OJZMssn2XyP7BtBe6CZ4DkJN7fEmDImiK
+m95HwzGYei59QAvS7z7Tsoyqj0ip/wDoKVgG97aTWpRzJiatWA7lQrjV6nN5ZGhT
+JbiEz5R6rgZFDKNrTdDGvuoYpDbwkrK6HIiPOlJ/915tgxyd8B/lw9bdpXiSPbBt
+LOrJz5RBGXFEaLpHPATpXbo+8DX3Fbae8i4VHj9HyMg4p3NFXU2wO7GOFyk36t0F
+ASK7lDYqjVs1/lMZLwhGwSqzGmIdTivZGwIDAQABo4IBDDCCAQgwDgYDVR0PAQH/
+BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwMwYIKwYBBQUHAQEEJzAlMCMGCCsG
+AQUFBzABhhdodHRwOi8vb2NzcC5lbnRydXN0Lm5ldDAwBgNVHR8EKTAnMCWgI6Ah
+hh9odHRwOi8vY3JsLmVudHJ1c3QubmV0L2cyY2EuY3JsMDsGA1UdIAQ0MDIwMAYE
+VR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVudHJ1c3QubmV0L3JwYTAd
+BgNVHQ4EFgQUgqJwdN28Uz/Pe9T3zX+nYMYKTL8wHwYDVR0jBBgwFoAUanImetAe
+733nO2lR1GyNn5ASZqswDQYJKoZIhvcNAQELBQADggEBADnVjpiDYcgsY9NwHRkw
+y/YJrMxp1cncN0HyMg/vdMNY9ngnCTQIlZIv19+4o/0OgemknNM/TWgrFTEKFcxS
+BJPok1DD2bHi4Wi3Ogl08TRYCj93mEC45mj/XeTIRsXsgdfJghhcg85x2Ly/rJkC
+k9uUmITSnKa1/ly78EqvIazCP0kkZ9Yujs+szGQVGHLlbHfTUqi53Y2sAEo1GdRv
+c6N172tkw+CNgxKhiucOhk3YtCAbvmqljEtoZuMrx1gL+1YQ1JH7HdMxWBCMRON1
+exCdtTix9qrKgWRs6PLigVWXUX/hwidQosk8WwBD9lu51aX8/wdQQGcHsFXwt35u
+Lcw=
+-----END CERTIFICATE-----
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1m_sha2.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1m_sha2.cer
new file mode 100644
index 00000000..d25ad440
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/certStore/toBeAdded/entrust_l1m_sha2.cer
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFLTCCBBWgAwIBAgIMYaHn0gAAAABR02amMA0GCSqGSIb3DQEBCwUAMIG+MQsw
+CQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2Vl
+IHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMDkg
+RW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTIwMAYDVQQD
+EylFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjAeFw0x
+NDEyMTUxNTI1MDNaFw0zMDEwMTUxNTU1MDNaMIG6MQswCQYDVQQGEwJVUzEWMBQG
+A1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5l
+dC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAt
+IGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gTDFNMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA0IHBOSPCsdHs91fdVSQ2kSAiSPf8ylIKsKs/M7WwhAf23056sPuY
+Ij0BrFb7cW2y7rmgD1J3q5iTvjOK64dex6qwymmPQwhqPyK/MzlG1ZTy4kwFItln
+gJHxBEoOm3yiydJs/TwJhL39axSagR3nioPvYRZ1R5gTOw2QFpi/iuInMlOZmcP7
+lhw192LtjL1JcdJDQ6Gh4yEqI3CodT2ybEYGYW8YZ+QpfrI8wcVfCR5uRE7sIZlY
+FUj0VUgqtzS0BeN8SYwAWN46lsw53GEzVc4qLj/RmWLoquY0djGqr3kplnjLgRSv
+adr7BLlZg0SqCU+01CwBnZuUMWstoc/B5QIDAQABo4IBKzCCAScwDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHRMBAf8E
+CDAGAQH/AgEAMDMGCCsGAQUFBwEBBCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29j
+c3AuZW50cnVzdC5uZXQwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL2NybC5lbnRy
+dXN0Lm5ldC9nMmNhLmNybDA7BgNVHSAENDAyMDAGBFUdIAAwKDAmBggrBgEFBQcC
+ARYaaHR0cDovL3d3dy5lbnRydXN0Lm5ldC9ycGEwHQYDVR0OBBYEFMP30LUqMK2v
+DZEhcDlU3byJcMc6MB8GA1UdIwQYMBaAFGpyJnrQHu995ztpUdRsjZ+QEmarMA0G
+CSqGSIb3DQEBCwUAA4IBAQC0h8eEIhopwKR47PVPG7SEl2937tTPWa+oQ5YvHVje
+pvMVWy7ZQ5xMQrkXFxGttLFBx2YMIoYFp7Qi+8VoaIqIMthx1hGOjlJ+Qgld2dnA
+DizvRGsf2yS89byxqsGK5Wbb0CTz34mmi/5e0FC6m3UAyQhKS3Q/WFOv9rihbISY
+Jnz8/DVRZZgeO2x28JkPxLkJ1YXYJKd/KsLak0tkuHB8VCnTglTVz6WUwzOeTTRn
+4Dh2ZgCN0C/GqwmqcvrOLzWJ/MDtBgO334wlV/H77yiI2YIowAQPlIFpI+CRKMVe
+1QzX1CA778n4wI+nQc1XRG5sZ2L+hN/nYNjvv9QiHg3n
+-----END CERTIFICATE----- \ No newline at end of file
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/entrust_g2_ca.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/entrust_g2_ca.cer
new file mode 100644
index 00000000..2e23a605
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/entrust_g2_ca.cer
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
+cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
+IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
+dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
+NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
+dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
+dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
+aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
+RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
+cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
+wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
+U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
+jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
+BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
+jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
+1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
+nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
+VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
+-----END CERTIFICATE-----
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 7257c574..e394114f 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUCommonGUI</artifactId>
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index a17026fc..d82a119e 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUFonts</artifactId>
<version>1.4-SNAPSHOT</version>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 3124272e..8c448313 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUGuiExt</artifactId>
<name>BKU GUI Ext</name>
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index eb11af57..3b49b1e8 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUHelp</artifactId>
<name>BKU Help</name>
diff --git a/BKUHelpWebStart/pom.xml b/BKUHelpWebStart/pom.xml
index e03d60e7..621e0eff 100644
--- a/BKUHelpWebStart/pom.xml
+++ b/BKUHelpWebStart/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>BKUHelpWebStart</artifactId>
<name>BKU Help WebStart</name>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 251f9cff..c4af3809 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKULocal</artifactId>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 9c39b685..8059fcdf 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUViewer</artifactId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index b2a6e700..783dc40d 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUWebStart</artifactId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index d32fb2bf..883b930f 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STAL</artifactId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 7c20552b..17c6a7be 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALExt</artifactId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 1e62e002..4c263abe 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALService</artifactId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 3fbef4b1..f26a496f 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALXService</artifactId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index f4331a94..a4b87e32 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bkucommon</artifactId>
diff --git a/pom.xml b/pom.xml
index 7f9d7217..d4f2872d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>at.gv.egiz</groupId>
<artifactId>mocca</artifactId>
<packaging>pom</packaging>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<name>MOCCA</name>
<description>MOCCA (Modular Open Citizen Card Architecture) project</description>
<url>http://joinup.ec.europa.eu/site/mocca/</url>
@@ -426,12 +426,12 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUCertificates</artifactId>
- <version>1.1.18-SNAPSHOT</version>
+ <version>1.1.19-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUFonts</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 1ed7eeda..e4024714 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>smcc</artifactId>
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre6.libosxj2pcsc.dylib b/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre6.libosxj2pcsc.dylib
deleted file mode 100644
index 2bc454e3..00000000
--- a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre6.libosxj2pcsc.dylib
+++ /dev/null
Binary files differ
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre7.libosxj2pcsc.dylib b/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre7.libosxj2pcsc.dylib
deleted file mode 100644
index 6228a60c..00000000
--- a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre7.libosxj2pcsc.dylib
+++ /dev/null
Binary files differ
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre8.libosxj2pcsc.dylib b/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre8.libosxj2pcsc.dylib
deleted file mode 100644
index 3a465a69..00000000
--- a/smcc/src/main/resources/at/gv/egiz/smcc/osx-pcsc-jni/jre8.libosxj2pcsc.dylib
+++ /dev/null
Binary files differ
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index dd2ddfd6..6e02bfe7 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>smccSTAL</artifactId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 74f65e5e..9b5f275a 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<artifactId>smccSTALExt</artifactId>
<name>smcc STAL Ext</name>
diff --git a/utils/pom.xml b/utils/pom.xml
index 35645a9f..ab221f16 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>utils</artifactId>
diff --git a/utils/src/main/java/at/gv/egiz/updater/Constants.java b/utils/src/main/java/at/gv/egiz/updater/Constants.java
index 89a75ee0..60b914c2 100644
--- a/utils/src/main/java/at/gv/egiz/updater/Constants.java
+++ b/utils/src/main/java/at/gv/egiz/updater/Constants.java
@@ -24,9 +24,13 @@ package at.gv.egiz.updater;
public class Constants {
- public static final String WEBSTART_URL = "https://webstart.buergerkarte.at/";
- public static final String MOCCA_STR = "mocca/";
- public static final String VERSION_FILE = "Release.txt";
- public static final String PATH_TO_VERSION_FILE = WEBSTART_URL + MOCCA_STR + VERSION_FILE;
+ //public static final String WEBSTART_URL = "https://webstart.buergerkarte.at/";
+ //public static final String MOCCA_STR = "mocca/";
+ //public static final String VERSION_FILE = "Release.txt";
+ //public static final String PATH_TO_VERSION_FILE = WEBSTART_URL + MOCCA_STR + VERSION_FILE;
+ public static final String DOWNLOAD_URL = "https://technology.a-sit.at/en/mocca/";
+ public static final String VERSION_FILE_URL = "https://updates.a-sit.at/mocca/Release.txt";
+
+
}
diff --git a/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java b/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java
index ad8f8d84..25927900 100644
--- a/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java
+++ b/utils/src/main/java/at/gv/egiz/updater/MoccaUpdater.java
@@ -70,19 +70,24 @@ public class MoccaUpdater {
return;
}
- gatherOnlineMoccaVersion();
- boolean isOnlineNewer = isOnlineVersionNewer();
- if (isOnlineNewer) {
- notifyUserNewerVersionOnline();
+ try {
+ gatherOnlineMoccaVersion();
+ boolean isOnlineNewer = isOnlineVersionNewer();
+ if (isOnlineNewer) {
+ notifyUserNewerVersionOnline();
+ }
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ log.error(e.getMessage());
}
}
- private void gatherOnlineMoccaVersion() {
+ private void gatherOnlineMoccaVersion() throws Exception {
try {
log.info("Requesting Mocca Online Version");
- URL url = new URL(Constants.PATH_TO_VERSION_FILE);
- log.debug("Going to GET mocca Version from: " + Constants.PATH_TO_VERSION_FILE);
+ URL url = new URL(Constants.VERSION_FILE_URL);
+ log.debug("Going to GET mocca Version from: " + Constants.VERSION_FILE_URL);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
@@ -96,6 +101,7 @@ public class MoccaUpdater {
log.info("Online Mocca Version: " + result.toString());
} catch (IOException e) {
log.error("Error when gathering Mocca Online Version " + e.getMessage());
+ throw new Exception("Error gathering Mocca Version number from Website ");
}
}
@@ -113,6 +119,7 @@ public class MoccaUpdater {
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.setVisible(true);
} catch (Exception e) {
+ System.err.print(e.getMessage());
log.error(e.getMessage());
}
diff --git a/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java b/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java
index 674d8339..64cef7f4 100644
--- a/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java
+++ b/utils/src/main/java/at/gv/egiz/updater/NewVersionDialog.java
@@ -165,7 +165,7 @@ public class NewVersionDialog extends JDialog {
private void openLink() {
if (Desktop.isDesktopSupported()) {
try {
- Desktop.getDesktop().browse(new URI(Constants.WEBSTART_URL+Constants.MOCCA_STR));
+ Desktop.getDesktop().browse(new URI(Constants.DOWNLOAD_URL));
} catch (IOException | URISyntaxException e) {
log.error(e.getMessage());
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 00:30:55 +0000