summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUCertificates/pom.xml4
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/DigiCert EV RSA CA G2.cerbin0 -> 1344 bytes
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GEANT_OV_RSA_CA_USERTrust_RSA_Certification_Authority.pem39
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GeoTrust EV RSA CA G2.cerbin0 -> 1344 bytes
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/Thawte EV RSA CA G2.cerbin0 -> 1342 bytes
-rw-r--r--BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/USERTrust_RSA_Certification_Authority_AAA_Certificate_Services.pem32
-rw-r--r--BKUCommonGUI/pom.xml2
-rw-r--r--BKUFonts/pom.xml4
-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.xml4
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java1
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java19
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java19
-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.xml50
-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
30 files changed, 144 insertions, 58 deletions
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 2241b58..4082dcd 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,14 +3,14 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<artifactId>BKUCertificates</artifactId>
<!-- DON'T CHANGE VERSION UNLESS THE INCLUDED CERTIFICATES CHANGED
| PLEASE COMMIT CHANGES to src/main/changes/changes.txt
| and don't forget to update version in main pom
|-->
- <version>1.1.17-SNAPSHOT</version>
+ <version>1.1.18-SNAPSHOT</version>
<name>BKU Certificates</name>
<description>Trusted certificates for TLS/SSL authentication</description>
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/DigiCert EV RSA CA G2.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/DigiCert EV RSA CA G2.cer
new file mode 100644
index 0000000..6376442
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/DigiCert EV RSA CA G2.cer
Binary files differ
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GEANT_OV_RSA_CA_USERTrust_RSA_Certification_Authority.pem b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GEANT_OV_RSA_CA_USERTrust_RSA_Certification_Authority.pem
new file mode 100644
index 0000000..43cf989
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GEANT_OV_RSA_CA_USERTrust_RSA_Certification_Authority.pem
@@ -0,0 +1,39 @@
+-----BEGIN CERTIFICATE-----
+MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw
+gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK
+ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD
+VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIw
+MDIxODAwMDAwMFoXDTMzMDUwMTIzNTk1OVowRDELMAkGA1UEBhMCTkwxGTAXBgNV
+BAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApYhi1aEiPsg9ZKRMAw9Q
+r8Mthsr6R20VSfFeh7TgwtLQi6RSRLOh4or4EMG/1th8lijv7xnBMVZkTysFiPmT
+PiLOfvz+QwO1NwjvgY+Jrs7fSoVA/TQkXzcxu4Tl3WHi+qJmKLJVu/JOuHud6mOp
+LWkIbhODSzOxANJ24IGPx9h4OXDyy6/342eE6UPXCtJ8AzeumTG6Dfv5KVx24lCF
+TGUzHUB+j+g0lSKg/Sf1OzgCajJV9enmZ/84ydh48wPp6vbWf1H0O3Rd3LhpMSVn
+TqFTLKZSbQeLcx/l9DOKZfBCC9ghWxsgTqW9gQ7v3T3aIfSaVC9rnwVxO0VjmDdP
+FNbdoxnh0zYwf45nV1QQgpRwZJ93yWedhp4ch1a6Ajwqs+wv4mZzmBSjovtV0mKw
+d+CQbSToalEUP4QeJq4Udz5WNmNMI4OYP6cgrnlJ50aa0DZPlJqrKQPGL69KQQz1
+2WgxvhCuVU70y6ZWAPopBa1ykbsttpLxADZre5cH573lIuLHdjx7NjpYIXRx2+QJ
+URnX2qx37eZIxYXz8ggM+wXH6RDbU3V2o5DP67hXPHSAbA+p0orjAocpk2osxHKo
+NSE3LCjNx8WVdxnXvuQ28tKdaK69knfm3bB7xpdfsNNTPH9ElcjscWZxpeZ5Iij8
+lyrCG1z0vSWtSBsgSnUyG/sCAwEAAaOCAYswggGHMB8GA1UdIwQYMBaAFFN5v1qq
+K0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBRvHTVJEGwy+lmgnryK6B+VvnF6DDAO
+BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwOAYDVR0gBDEwLzAtBgRVHSAAMCUwIwYIKwYBBQUH
+AgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMFAGA1UdHwRJMEcwRaBDoEGGP2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6
+Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAl
+BggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0B
+AQwFAAOCAgEAUtlC3e0xj/1BMfPhdQhUXeLjb0xp8UE28kzWE5xDzGKbfGgnrT2R
+lw5gLIx+/cNVrad//+MrpTppMlxq59AsXYZW3xRasrvkjGfNR3vt/1RAl8iI31lG
+hIg6dfIX5N4esLkrQeN8HiyHKH6khm4966IkVVtnxz5CgUPqEYn4eQ+4eeESrWBh
+AqXaiv7HRvpsdwLYekAhnrlGpioZ/CJIT2PTTxf+GHM6cuUnNqdUzfvrQgA8kt1/
+ASXx2od/M+c8nlJqrGz29lrJveJOSEMX0c/ts02WhsfMhkYa6XujUZLmvR1Eq08r
+48/EZ4l+t5L4wt0DV8VaPbsEBF1EOFpz/YS2H6mSwcFaNJbnYqqJHIvm3PLJHkFm
+EoLXRVrQXdCT+3wgBfgU6heCV5CYBz/YkrdWES7tiiT8sVUDqXmVlTsbiRNiyLs2
+bmEWWFUl76jViIJog5fongEqN3jLIGTG/mXrJT1UyymIcobnIGrbwwRVz/mpFQo0
+vBYIi1k2ThVh0Dx88BbF9YiP84dd8Fkn5wbE6FxXYJ287qfRTgmhePecPc73Yrzt
+apdRcsKVGkOpaTIJP/l+lAHRLZxk/dUtyN95G++bOSQqnOCpVPabUGl2E/OEyFrp
+Ipwgu2L/WJclvd6g+ZA/iWkLSMcpnFb+uX6QBqvD6+RNxul1FaB5iHY=
+-----END CERTIFICATE-----
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GeoTrust EV RSA CA G2.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GeoTrust EV RSA CA G2.cer
new file mode 100644
index 0000000..815c92d
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/GeoTrust EV RSA CA G2.cer
Binary files differ
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/Thawte EV RSA CA G2.cer b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/Thawte EV RSA CA G2.cer
new file mode 100644
index 0000000..6b2654c
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/Thawte EV RSA CA G2.cer
Binary files differ
diff --git a/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/USERTrust_RSA_Certification_Authority_AAA_Certificate_Services.pem b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/USERTrust_RSA_Certification_Authority_AAA_Certificate_Services.pem
new file mode 100644
index 0000000..cc2d08b
--- /dev/null
+++ b/BKUCertificates/src/main/resources/at/gv/egiz/bku/certs/trustStore/USERTrust_RSA_Certification_Authority_AAA_Certificate_Services.pem
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFgTCCBGmgAwIBAgIQOXJEOvkit1HX02wQ3TE1lTANBgkqhkiG9w0BAQwFADB7
+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
+VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
+AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4
+MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5
+MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO
+ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sI
+s9CsVw127c0n00ytUINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnG
+vDoZtF+mvX2do2NCtnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQ
+Ijy8/hPwhxR79uQfjtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfb
+IWax1Jt4A8BQOujM8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0
+tyA9yn8iNK5+O2hmAUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97E
+xwzf4TKuzJM7UXiVZ4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNV
+icQNwZNUMBkTrNN9N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5
+D9kCnusSTJV882sFqV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJ
+WBp/kjbmUZIO8yZ9HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ
+5lhCLkMaTLTwJUdZ+gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzG
+KAgEJTm4Diup8kyXHAc/DVL17e8vgg8CAwEAAaOB8jCB7zAfBgNVHSMEGDAWgBSg
+EQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rID
+ZsswDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAG
+BgRVHSAAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t
+L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUA
+A4IBAQAYh1HcdCE9nIrgJ7cz0C7M7PDmy14R3iJvm3WOnnL+5Nb+qh+cli3vA0p+
+rvSNb3I8QzvAP+u431yqqcau8vzY7qN7Q/aGNnwU4M309z/+3ri0ivCRlv79Q2R+
+/czSAaF9ffgZGclCKxO/WIu6pKJmBHaIkU4MiRTOok3JMrO66BQavHHxW/BBC5gA
+CiIDEOUMsfnNkjcZ7Tvx5Dq2+UUTJnWvu6rvP3t3O9LEApE9GQDTF1w52z97GA1F
+zZOFli9d31kWTz9RvdVFGD/tSo7oBmF0Ixa1DVBzJ0RHfxBdiSprhTEUxOipakyA
+vGp4z7h/jnZymQyd/teRCBaho1+V
+-----END CERTIFICATE-----
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 6b4d6ca..7257c57 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUCommonGUI</artifactId>
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 65972ed..a17026f 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<artifactId>BKUFonts</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<name>BKU Fonts</name>
<description>
<!--
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 4abd0b1..3124272 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<artifactId>BKUGuiExt</artifactId>
<name>BKU GUI Ext</name>
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 376868e..eb11af5 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<artifactId>BKUHelp</artifactId>
<name>BKU Help</name>
diff --git a/BKUHelpWebStart/pom.xml b/BKUHelpWebStart/pom.xml
index 6c0e12e..e03d60e 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<artifactId>BKUHelpWebStart</artifactId>
<name>BKU Help WebStart</name>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index e02ae67..251f9cf 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKULocal</artifactId>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 268b7b4..9c39b68 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUViewer</artifactId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index d951caa..b2a6e70 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BKUWebStart</artifactId>
@@ -374,7 +374,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.19</version>
+ <version>6.1.26</version>
</dependency>
<!-- JSP support
| http://jira.codehaus.org/browse/JETTY-827
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
index ee951a4..026a947 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
@@ -135,7 +135,6 @@ public class Launcher implements BKUControllerInterface {
}
private Configurator config;
private Container server;
-// private BasicService basicService;
private StatusNotifier status;
private Autostart autostart;
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java
index 4b817ae..379b971 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java
@@ -56,7 +56,8 @@ import org.slf4j.LoggerFactory;
public class TLSServerCA {
public static final int CA_VALIDITY_Y = 3;
public static final String MOCCA_TLS_SERVER_ALIAS = "server";
- public static final int SERVER_VALIDITY_Y = 3;
+ public static final int SERVER_VALIDITY_Y = 3;
+ public static final int SERVER_VALIDITY_Y_MAC = 2;
private final static Logger log = LoggerFactory.getLogger(TLSServerCA.class);
private KeyPair caKeyPair;
@@ -139,14 +140,26 @@ public class TLSServerCA {
GregorianCalendar date = new GregorianCalendar();
date.add(Calendar.HOUR_OF_DAY, -1);
- serverCert.setValidNotBefore(date.getTime());
- date.add(Calendar.YEAR,SERVER_VALIDITY_Y);
+ serverCert.setValidNotBefore(date.getTime());
+ if (isMacOs()) {
+ date.add(Calendar.YEAR,SERVER_VALIDITY_Y_MAC);
+ } else {
+ date.add(Calendar.YEAR,SERVER_VALIDITY_Y);
+ }
date.add(Calendar.HOUR_OF_DAY, -1);
serverCert.setValidNotAfter(date.getTime());
serverCert.sign(AlgorithmID.sha256WithRSAEncryption, caKeyPair.getPrivate());
log.debug("successfully generated MOCCA TLS Server certificate " + serverCert.getSubjectDN());
caKeyPair = null;
+ }
+
+ private boolean isMacOs() {
+ String os = System.getProperty("os.name").toLowerCase();
+ if (os.contains("mac")) {
+ return true;
+ }
+ return false;
}
public KeyStore generateKeyStore(char[] password) throws GeneralSecurityException, IOException, CodingException {
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java
index 1b9996f..c12ffde 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java
@@ -152,14 +152,17 @@ public class MOCCAIcon implements StatusNotifier, ActionListener, ItemListener {
Menu settingsMenu = new Menu(messages.getString(LABEL_SETTINGS));
menu.add(settingsMenu);
- CheckboxMenuItem autostartItem = new CheckboxMenuItem(
- messages.getString(LABEL_AUTOSTART));
- autostartItem.addItemListener(this);
- autostartItem.setActionCommand(COMMANDS.AUTOSTART_COMMAND.name());
- autostartItem.setState(controller.isAutostartEnabled());
- autostartItem.setEnabled(controller.isAutostartPossible());
- settingsMenu.add(autostartItem);
-
+ // only add autostart for older java versions
+ String version = System.getProperty("java.version");
+ if (version.startsWith("1.")) {
+ CheckboxMenuItem autostartItem = new CheckboxMenuItem(
+ messages.getString(LABEL_AUTOSTART));
+ autostartItem.addItemListener(this);
+ autostartItem.setActionCommand(COMMANDS.AUTOSTART_COMMAND.name());
+ autostartItem.setState(controller.isAutostartEnabled());
+ autostartItem.setEnabled(controller.isAutostartPossible());
+ settingsMenu.add(autostartItem);
+ }
menu.addSeparator();
MenuItem shutdownItem = new MenuItem(
diff --git a/STAL/pom.xml b/STAL/pom.xml
index c2e3ab0..d32fb2b 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STAL</artifactId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 9ee07dc..7c20552 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALExt</artifactId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index de39a53..1e62e00 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALService</artifactId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index b322bf2..3fbef4b 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>STALXService</artifactId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index d5dfd23..f4331a9 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bkucommon</artifactId>
diff --git a/pom.xml b/pom.xml
index 47e99e7..7f9d721 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
<name>MOCCA</name>
<description>MOCCA (Modular Open Citizen Card Architecture) project</description>
<url>http://joinup.ec.europa.eu/site/mocca/</url>
@@ -222,16 +222,16 @@
<name>MOCCA JoinUp</name>
<url>https://apps.egiz.gv.at/maven/</url>
</repository>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- <repository>
- <id>maven-central</id>
- <name>Maven Central Repository</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
+<!-- <repository> -->
+<!-- <id>maven2-repository.dev.java.net</id> -->
+<!-- <name>Java.net Repository for Maven 2</name> -->
+<!-- <url>http://download.java.net/maven/2/</url> -->
+<!-- </repository> -->
+<!-- <repository> -->
+<!-- <id>maven-central</id> -->
+<!-- <name>Maven Central Repository</name> -->
+<!-- <url>http://repo1.maven.org/maven2/</url> -->
+<!-- </repository> -->
<repository>
<id>internal-repo</id>
<name>Internal Repository</name>
@@ -239,18 +239,18 @@
</repository>
</repositories>
<pluginRepositories>
- <pluginRepository>
- <id>maven-central</id>
- <name>Maven Central Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- </pluginRepository>
+<!-- <pluginRepository> -->
+<!-- <id>maven-central</id> -->
+<!-- <name>Maven Central Plugin Repository</name> -->
+<!-- <url>http://repo1.maven.org/maven2</url> -->
+<!-- <layout>default</layout> -->
+<!-- <snapshots> -->
+<!-- <enabled>false</enabled> -->
+<!-- </snapshots> -->
+<!-- <releases> -->
+<!-- <updatePolicy>never</updatePolicy> -->
+<!-- </releases> -->
+<!-- </pluginRepository> -->
<pluginRepository>
<id>mocca-joinup</id>
<name>MOCCA JoinUp</name>
@@ -426,12 +426,12 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUCertificates</artifactId>
- <version>1.1.17-SNAPSHOT</version>
+ <version>1.1.18-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUFonts</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 2bd69e9..1ed7eed 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.2-SNAPSHOT</version>
+ <version>1.4.3-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 2bc454e..0000000
--- 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 6228a60..0000000
--- 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 3a465a6..0000000
--- 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 1cba28b..dd2ddfd 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>smccSTAL</artifactId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index aea28a1..74f65e5 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<artifactId>smccSTALExt</artifactId>
<name>smcc STAL Ext</name>
diff --git a/utils/pom.xml b/utils/pom.xml
index 3e3c4f5..35645a9 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.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>utils</artifactId>