From: Jim Procter Date: Wed, 30 Mar 2022 17:35:07 +0000 (+0100) Subject: Merge branch 'patch/JAL-3976_3dbeaconsnull' into develop X-Git-Tag: Release_2_11_2_1~7 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=b2440df64433ec05dbaca3cf0e2432c59d8a9e15;hp=c9c5cdd4e2859de09b36d76227e0d0dce7aaf98d Merge branch 'patch/JAL-3976_3dbeaconsnull' into develop --- diff --git a/RELEASE b/RELEASE index ddc7974..dbf7cac 100644 --- a/RELEASE +++ b/RELEASE @@ -1,2 +1,2 @@ jalview.release=releases/Release_2_11_2_Branch -jalview.version=2.11.2.0 +jalview.version=2.11.2.1 diff --git a/build.gradle b/build.gradle index 9b1eb69..b4636bc 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ plugins { id 'com.github.johnrengelman.shadow' version '4.0.3' id 'com.install4j.gradle' version '9.0.6' id 'com.dorongold.task-tree' version '1.5' // only needed to display task dependency tree with gradle task1 [task2 ...] taskTree - id 'com.palantir.git-version' version '0.12.3' + id 'com.palantir.git-version' version '0.13.0' apply false } repositories { @@ -115,7 +115,7 @@ ext { // Import releaseProps from the RELEASE file // or a file specified via JALVIEW_RELEASE_FILE if defined // Expect jalview.version and target release branch in jalview.release - def releaseProps = new Properties(); + releaseProps = new Properties(); def releasePropFile = findProperty("JALVIEW_RELEASE_FILE"); def defaultReleasePropFile = "${jalviewDirAbsolutePath}/RELEASE"; try { @@ -383,9 +383,21 @@ ext { modules_compileClasspath = fileTree(dir: "${jalviewDir}/${j11modDir}", include: ["*.jar"]) modules_runtimeClasspath = modules_compileClasspath */ - def details = versionDetails() - gitHash = details.gitHash - gitBranch = details.branchName + + gitHash = "SOURCE" + gitBranch = "Source" + try { + apply plugin: "com.palantir.git-version" + def details = versionDetails() + gitHash = details.gitHash + gitBranch = details.branchName + } catch(org.gradle.api.internal.plugins.PluginApplicationException e) { + println("Not in a git repository. Using git values from RELEASE properties file.") + gitHash = releaseProps.getProperty("git.hash") + gitBranch = releaseProps.getProperty("git.branch") + } catch(java.lang.RuntimeException e1) { + throw new GradleException("Error with git-version plugin. Directory '.git' exists but versionDetails() cannot be found.") + } println("Using a ${CHANNEL} profile.") @@ -2004,6 +2016,22 @@ spotless { } } +task createSourceReleaseProperties(type: WriteProperties) { + group = "distribution" + description = "Create the source RELEASE properties file" + + def sourceTarBuildDir = "${buildDir}/sourceTar" + def sourceReleasePropertiesFile = "${sourceTarBuildDir}/RELEASE" + outputFile (sourceReleasePropertiesFile) + + doFirst { + releaseProps.each{ key, val -> property key, val } + property "git.branch", gitBranch + property "git.hash", gitHash + } + + outputs.file(outputFile) +} task sourceDist(type: Tar) { group "distribution" @@ -2011,6 +2039,9 @@ task sourceDist(type: Tar) { dependsOn createBuildProperties dependsOn convertMdFiles + dependsOn eclipseAllPreferences + dependsOn createSourceReleaseProperties + def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_") def outputFileName = "${project.name}_${VERSION_UNDERSCORES}.tar.gz" @@ -2035,6 +2066,7 @@ task sourceDist(type: Tar) { "*locales/**", "utils/InstallAnywhere", "**/*.log", + "RELEASE", ] def PROCESS_FILES=[ "AUTHORS", @@ -2044,7 +2076,6 @@ task sourceDist(type: Tar) { "FEATURETODO", "LICENSE", "**/README", - "RELEASE", "THIRDPARTYLIBS", "TESTNG", "build.gradle", @@ -2059,7 +2090,9 @@ task sourceDist(type: Tar) { "**/*.sh", ] def INCLUDE_FILES=[ - ".settings/org.eclipse.jdt.core.jalview.prefs", + ".classpath", + ".settings/org.eclipse.buildship.core.prefs", + ".settings/org.eclipse.jdt.core.prefs" ] from(jalviewDir) { @@ -2106,6 +2139,10 @@ task sourceDist(type: Tar) { }) } + def sourceTarBuildDir = "${buildDir}/sourceTar" + from(sourceTarBuildDir) { + // this includes the appended RELEASE properties file + } } diff --git a/help/help/html/releases.html b/help/help/html/releases.html index b9a27ff..6f72dcb 100755 --- a/help/help/html/releases.html +++ b/help/help/html/releases.html @@ -58,6 +58,64 @@ li:before { 2.11.2.1
+ 31/03/2022 + + + + + New Known Issues + + + + + 2.11.2.0
10/03/2022 @@ -162,8 +220,8 @@ li:before { application from command line. -
  • Notarized MacOS installer for compliance with - latest OSX releases (Monterey)
    • +
  • Notarized MacOS installer for compliance with latest + OSX releases (Monterey)
  • Uninstaller application for old (InstallAnywhere based) Jalview installations removed from @@ -228,7 +286,9 @@ li:before {
  • First integrated JalviewJS and Jalview release
    • -
  • Updated README and doc/building.md
    • +
  • + Updated README and doc/building.md +
  • Improved JalviewJS/Jalview build process, added support for system package provided eclipse @@ -246,7 +306,7 @@ li:before {
    • - +