git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
05add34
)
JAL-3718 force re-initialise of getdown.txt file when new getdown.txt downloaded...
author
Ben Soares
<b.soares@dundee.ac.uk>
Mon, 14 Sep 2020 22:23:11 +0000
(23:23 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Tue, 15 Sep 2020 15:15:43 +0000
(16:15 +0100)
getdown/src/getdown/ant/pom.xml
patch
|
blob
|
history
getdown/src/getdown/core/pom.xml
patch
|
blob
|
history
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
patch
|
blob
|
history
getdown/src/getdown/launcher/pom.xml
patch
|
blob
|
history
getdown/src/getdown/mvn_cmd
patch
|
blob
|
history
getdown/src/getdown/pom.xml
patch
|
blob
|
history
diff --git
a/getdown/src/getdown/ant/pom.xml
b/getdown/src/getdown/ant/pom.xml
index
cb427ba
..
c180d5f
100644
(file)
--- a/
getdown/src/getdown/ant/pom.xml
+++ b/
getdown/src/getdown/ant/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3-1.2.7_FJVL</version>
+ <version>1.8.3-1.2.9_FJVL</version>
</parent>
<artifactId>getdown-ant</artifactId>
</parent>
<artifactId>getdown-ant</artifactId>
diff --git
a/getdown/src/getdown/core/pom.xml
b/getdown/src/getdown/core/pom.xml
index
1f4b310
..
dd387b1
100644
(file)
--- a/
getdown/src/getdown/core/pom.xml
+++ b/
getdown/src/getdown/core/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3-1.2.7_FJVL</version>
+ <version>1.8.3-1.2.9_FJVL</version>
</parent>
<artifactId>getdown-core</artifactId>
</parent>
<artifactId>getdown-core</artifactId>
diff --git
a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index
cffe7c1
..
313a690
100644
(file)
--- a/
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@
-1427,6
+1427,8
@@
public class Application
clearValidationMarkers();
// if the new copy validates, reinitialize ourselves; otherwise report baffling hoseage
if (_digest.validateResource(crsrc, null)) {
clearValidationMarkers();
// if the new copy validates, reinitialize ourselves; otherwise report baffling hoseage
if (_digest.validateResource(crsrc, null)) {
+ // unset _initialisedConfig so new file is initialised
+ _initialisedConfig = null;
init(true);
} else {
log.warning(CONFIG_FILE + " failed to validate even after redownloading. " +
init(true);
} else {
log.warning(CONFIG_FILE + " failed to validate even after redownloading. " +
diff --git
a/getdown/src/getdown/launcher/pom.xml
b/getdown/src/getdown/launcher/pom.xml
index
dac34c0
..
e7dbeb1
100644
(file)
--- a/
getdown/src/getdown/launcher/pom.xml
+++ b/
getdown/src/getdown/launcher/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3-1.2.7_FJVL</version>
+ <version>1.8.3-1.2.9_FJVL</version>
</parent>
<artifactId>getdown-launcher</artifactId>
</parent>
<artifactId>getdown-launcher</artifactId>
diff --git
a/getdown/src/getdown/mvn_cmd
b/getdown/src/getdown/mvn_cmd
index
ff85c2d
..
e0d7cf1
100755
(executable)
--- a/
getdown/src/getdown/mvn_cmd
+++ b/
getdown/src/getdown/mvn_cmd
@@
-3,7
+3,7
@@
if [ x$JVLVERSION != x ]; then
export VERSION=$JVLVERSION
else
if [ x$JVLVERSION != x ]; then
export VERSION=$JVLVERSION
else
- export VERSION=1.8.3-1.2.7_JVL
+ export VERSION=1.8.3-1.2.9_JVL
fi
if [ x${VERSION%_JVL} = x$VERSION ]; then
fi
if [ x${VERSION%_JVL} = x$VERSION ]; then
diff --git
a/getdown/src/getdown/pom.xml
b/getdown/src/getdown/pom.xml
index
c3f51d2
..
8c7c521
100644
(file)
--- a/
getdown/src/getdown/pom.xml
+++ b/
getdown/src/getdown/pom.xml
@@
-10,7
+10,7
@@
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<packaging>pom</packaging>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<packaging>pom</packaging>
- <version>1.8.3-1.2.7_FJVL</version>
+ <version>1.8.3-1.2.9_FJVL</version>
<name>getdown</name>
<description>An application installer and updater.</description>
<name>getdown</name>
<description>An application installer and updater.</description>