Skip to content

Commit 7c373f6

Browse files
jordeujordeu
committed
Merge branch 'release/gitools-2.3.0' into develop
2 parents 144f3d7 + 1d4c0bc commit 7c373f6

File tree

18 files changed

+36
-25
lines changed

18 files changed

+36
-25
lines changed

‎changelog.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Gitools 2.2.4
1+
Gitools 2.3.0
22
-----------------------------------------------------------
33
* Added Median aggregator
44
* Added transformation methods to aggregation header wizard
@@ -8,6 +8,7 @@ Gitools 2.2.4
88
* Edit annotation values within the application
99
* Enable show/hide headers from details box
1010
* Remove Layer Action
11+
* Biomart sources update
1112

1213
Gitools 2.2.3
1314
------------------------------------------------------------

‎doc/source/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
# built documents.
5151
#
5252
# The short X.Y version.
53-
version = '2.2'
53+
version = '2.3'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '2.2.3'
55+
release = '2.3.0'
5656

5757
# The language for content autogenerated by Sphinx. Refer to documentation
5858
# for a list of supported languages.

‎howto-release.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ git-flow hotfix start gitools-2.2.2
1212
# Update pom.xml version
1313
# The following command only prints to display
1414
# Check that you are going to update only the correct versions:
15-
find . -name pom.xml | awk '{ system("sed 0,/2.3.0-SNAPSHOT/s//2.2.2/ "$0)}' | grep -A2 -B3 2.2.2
15+
find . -name pom.xml | awk '{ system("sed 0,/2.3.0-SNAPSHOT/s//2.3.0/ "$0)}' | grep -A2 -B3 2.3.0
1616

1717
# The following command will apply the changes
1818
# Update all like this:
19-
find . -name pom.xml | awk '{ system("sed -i 0,/2.3.0-SNAPSHOT/s//2.2.2/ "$0)}'
19+
find . -name pom.xml | awk '{ system("sed -i 0,/2.3.0-SNAPSHOT/s//2.3.0/ "$0)}'
2020

2121
# Go to Documentation folder.
22-
# Check in src/conf.py if the version numbers are up to date
22+
# Check in source/conf.py if the version numbers are up to date
2323
# Generate the documentation (which hopefully is up to date).
2424
# verify the documentation has the same version as Gitools
2525
cd doc
@@ -35,16 +35,16 @@ mvn -P test-analysis clean install assembly:assembly
3535

3636
# Test new release
3737
cd target
38-
unzip gitools-2.2.2-bin.zip
39-
gitools-2.2.2/bin/gitools
38+
unzip gitools-2.3.0-bin.zip
39+
gitools-2.3.0/gitools
4040
cd ..
4141

4242
# Deploy ZIP file
43-
scp target/gitools-2.2.2-bin.zip bgadmin@ankara:/usr/local/gitools/www/downloads/
43+
scp target/gitools-2.3.0-bin.zip bgadmin@ankara:/usr/local/gitools/www/downloads/
4444

4545
# Deploy Webstart
4646
# change back to the gitools root folder
47-
./webstart-deploy.sh 2.2.2
47+
./webstart-deploy.sh 2.3.0
4848

4949
# Update this file on the server:
5050
/usr/local/gitools/www/downloads/latest.txt
@@ -56,7 +56,7 @@ make clean
5656
cd ..
5757

5858
# Commit the changes
59-
git commit -a -m "Release version 2.2.2"
59+
git commit -a -m "Release version 2.3.0"
6060

6161
# Finish the release or hotfix
6262
git flow release finish gitools-2.2.2

‎org.gitools.analysis/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎org.gitools.api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎org.gitools.cli/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.gitools</groupId>
55
<artifactId>gitools</artifactId>
6-
<version>2.3.0-SNAPSHOT</version>
6+
<version>2.3.0</version>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>

‎org.gitools.datasources/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎org.gitools.datasources/src/main/resources/biomart-sources.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@
6060
<wsdlPath>biomart/martwsdl</wsdlPath>
6161
<release>75</release>
6262
</mart>
63+
<mart>
64+
<name>ensembl_82</name>
65+
<description>Ensembl 82 (Sep 2015)</description>
66+
<version>0.6</version>
67+
<host>sep2015.archive.ensembl.org</host>
68+
<port>80</port>
69+
<restPath>/biomart/martservice</restPath>
70+
<wsdlPath>biomart/martwsdl</wsdlPath>
71+
<release>82</release>
72+
</mart>
6373
<mart>
6474
<name>ensembl_81</name>
6575
<description>Ensembl 81 (Jul 2015)</description>

‎org.gitools.heatmap/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎org.gitools.matrix/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)