From eef9db4c1065bcbefb8a0c0bd6f560e1af42c44c Mon Sep 17 00:00:00 2001 From: jakubs <jakubs> Date: Mon, 18 Apr 2016 15:07:59 +0000 Subject: [PATCH] SSDM-3510 add explicite declaration of jython 2.7 SVN: 36208 --- datastore_server/dist/etc/service.properties | 2 ++ .../datastore_server/etc/service.properties | 2 ++ .../openBIS-server/jetty/etc/service.properties | 2 ++ 3 files changed, 6 insertions(+) diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties index 5fcadf58078..3ed4a1700ba 100644 --- a/datastore_server/dist/etc/service.properties +++ b/datastore_server/dist/etc/service.properties @@ -428,3 +428,5 @@ ftp.server.dataset.show-parents-and-children = true # hidden and FTP users will not see them. # Example (will only show PNG files for data sets of type HCS_IMAGE): # ftp.server.dataset.filelist.filter.HCS_IMAGE= .*png + +jython-version=2.7 diff --git a/datastore_server/resource/test-data/BackupDatabaseDescriptionGeneratorTest/datastore_server/etc/service.properties b/datastore_server/resource/test-data/BackupDatabaseDescriptionGeneratorTest/datastore_server/etc/service.properties index 2890dd8a540..103e1adf371 100644 --- a/datastore_server/resource/test-data/BackupDatabaseDescriptionGeneratorTest/datastore_server/etc/service.properties +++ b/datastore_server/resource/test-data/BackupDatabaseDescriptionGeneratorTest/datastore_server/etc/service.properties @@ -9,3 +9,5 @@ imaging-db.basicDatabaseName = imaging imaging-db.databaseKind = barkind imaging-db.scriptFolder = source/sql/imaging + +jython-version=2.7 diff --git a/datastore_server/resource/test-data/BackupDatabaseDescriptionGeneratorTest/openBIS-server/jetty/etc/service.properties b/datastore_server/resource/test-data/BackupDatabaseDescriptionGeneratorTest/openBIS-server/jetty/etc/service.properties index a378970052e..00b882b7214 100644 --- a/datastore_server/resource/test-data/BackupDatabaseDescriptionGeneratorTest/openBIS-server/jetty/etc/service.properties +++ b/datastore_server/resource/test-data/BackupDatabaseDescriptionGeneratorTest/openBIS-server/jetty/etc/service.properties @@ -15,3 +15,5 @@ database.owner = database.owner-password = database.admin-user = database.admin-password = + +jython-version=2.7 -- GitLab