From 0dd6c936285f17b22d24fbd0854b1be12f254aec Mon Sep 17 00:00:00 2001 From: apriestman Date: Tue, 28 Jul 2020 13:49:13 -0400 Subject: [PATCH 1/2] Switch to release --- nbproject/project.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index d0eec3ae02..04e9e8002a 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -6,8 +6,8 @@ app.name=${branding.token} ### if left unset, version will default to today's date app.version=4.16.0 ### build.type must be one of: DEVELOPMENT, RELEASE -#build.type=RELEASE -build.type=DEVELOPMENT +build.type=RELEASE +#build.type=DEVELOPMENT project.org.netbeans.progress=org-netbeans-api-progress project.org.sleuthkit.autopsy.experimental=Experimental From 54dfff7ec8c717fc637627799ce3023a0bddf37e Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 17 Aug 2020 11:45:50 -0400 Subject: [PATCH 2/2] Simplified CR search service status reporting --- .../centralrepository/datamodel/Bundle.properties-MERGED | 1 - .../datamodel/CentralRepositoryService.java | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Bundle.properties-MERGED index ca1cd14877..2ed5a7ce87 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Bundle.properties-MERGED @@ -12,7 +12,6 @@ CentralRepoDbChoice.PostgreSQL.Text=Custom PostgreSQL CentralRepoDbChoice.PostgreSQL_Multiuser.Text=PostgreSQL using multi-user settings CentralRepoDbChoice.Sqlite.Text=SQLite CentralRepoDbManager.connectionErrorMsg.text=Failed to connect to central repository database. -CentralRepositoryService.progressMsg.updatingDataSourcesTable=Checking for v1.2 data updates... CentralRepositoryService.progressMsg.updatingSchema=Updating schema... CentralRepositoryService.serviceName=Central Repository Service CorrelationAttributeInstance.invalidName.message=Invalid database table name. Name must start with a lowercase letter and can only contain lowercase letters, numbers, and '_'. diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepositoryService.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepositoryService.java index 8b442efc24..c60b5ab84a 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepositoryService.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepositoryService.java @@ -42,8 +42,8 @@ public class CentralRepositoryService implements AutopsyService { } @NbBundle.Messages({ - "CentralRepositoryService.progressMsg.updatingSchema=Updating schema...", - "CentralRepositoryService.progressMsg.updatingDataSourcesTable=Checking for v1.2 data updates...",}) + "CentralRepositoryService.progressMsg.updatingSchema=Updating schema..." + }) @Override public void openCaseResources(CaseContext context) throws AutopsyServiceException { if (!CentralRepository.isEnabled()) { @@ -58,7 +58,6 @@ public class CentralRepositoryService implements AutopsyService { return; } - progress.progress(Bundle.CentralRepositoryService_progressMsg_updatingDataSourcesTable()); dataUpgradeForVersion1dot2(context.getCase()); }