Skip to content

Commit 706a3ac

Browse files
scribescribe
authored
Merge pull request #275 from shabtaisharon/bumpVersion
Bump version
2 parents 8071987 + beb0056 commit 706a3ac

5 files changed

Lines changed: 46 additions & 42 deletions

File tree

‎Builders/Windows/SetupProject/SetupProject/DsbFiles.wxs‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@
4545
<Component Win64="yes" Id="cmpFC9F1A459EB94982D02533FB9C9C0663" Guid="*">
4646
<File Id="fil3127093411A179636DF1C22E20933A51" KeyPath="yes" Source="$(var.DsbPath)\ds3-utils-5.0.3.jar" />
4747
</Component>
48-
<Component Win64="yes" Id="cmp9A482979A5B4A6872A53B6CE72603DB2" Guid="*">
49-
<File Id="fil9B4EEF85CBF83E1F334CE43EA340C01E" KeyPath="yes" Source="$(var.DsbPath)\dsb-api-5.0.3.jar" />
48+
<Component Win64="yes" Id="cmp40B643CB0594FF8A6000A4489D7AB60D" Guid="*">
49+
<File Id="fil414B56CE316E518913FD58D031FB054B" KeyPath="yes" Source="$(var.DsbPath)\dsb-api-5.0.4.jar" />
5050
</Component>
51-
<Component Win64="yes" Id="cmpBFD6F3237B9B903B80183A05F11FA9F9" Guid="*">
52-
<File Id="fil0FB52DBA9FAF6077DF010B36A40E780B" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.3-all.jar" />
51+
<Component Win64="yes" Id="cmp0208B54B5CB1F18EE220536498990134" Guid="*">
52+
<File Id="fil33DD914A06756C965E6906E979C88662" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.4-all.jar" />
5353
</Component>
54-
<Component Win64="yes" Id="cmpFEA000D3F17A6E43EACFC75D68843B96" Guid="*">
55-
<File Id="filF7F0A91994E821F9A96359C603E31309" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.3.jar" />
54+
<Component Win64="yes" Id="cmp6E0B2555642AED03CF6D2BBCF3A8F7C5" Guid="*">
55+
<File Id="fil85643A2F7B1FC30BE1590942316F05C0" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.4.jar" />
5656
</Component>
57-
<Component Win64="yes" Id="cmpA5B4E3B30F661FFEC8759B6CF2A582E1" Guid="*">
58-
<File Id="fil23D22C0664566A3D036A731F2AF20BE4" KeyPath="yes" Source="$(var.DsbPath)\dsb-util-5.0.3.jar" />
57+
<Component Win64="yes" Id="cmpC8CEB4861737F3C4CFD2DC7F9A690678" Guid="*">
58+
<File Id="filF1FF4AF57CDCAF3410164D4ED12436C9" KeyPath="yes" Source="$(var.DsbPath)\dsb-util-5.0.4.jar" />
5959
</Component>
6060
<Component Win64="yes" Id="cmp67C8CE44E28F997FEAC97FF167229D5B" Guid="*">
6161
<File Id="filA4B497FD8BD148D3F7E813CA3071514F" KeyPath="yes" Source="$(var.DsbPath)\error_prone_annotations-2.1.3.jar" />
@@ -111,23 +111,26 @@
111111
<Component Win64="yes" Id="cmpCD6AD685522DF68D5181FEAD85B297E8" Guid="*">
112112
<File Id="fil7F68381C84013F2EF34B6CD1D3804269" KeyPath="yes" Source="$(var.DsbPath)\jcip-annotations-1.0.jar" />
113113
</Component>
114-
<Component Win64="yes" Id="cmp8315E32D185CAE4CD0C6BF66D89B6CD1" Guid="*">
115-
<File Id="fil9CE27585C76C71B1B64C23A6FC0BD419" KeyPath="yes" Source="$(var.DsbPath)\jna-4.5.1.jar" />
114+
<Component Win64="yes" Id="cmp97EFDBF9C76488F17C1DCC8BC8DF619F" Guid="*">
115+
<File Id="filD7EDE0DCED749D5BF4F57872608A8675" KeyPath="yes" Source="$(var.DsbPath)\jna-4.5.2.jar" />
116116
</Component>
117-
<Component Win64="yes" Id="cmp59C4F8454CC18F739028870DADE52F1E" Guid="*">
118-
<File Id="filBB6C8AA078FE7E3C008C0A3E6D50D6D9" KeyPath="yes" Source="$(var.DsbPath)\jna-platform-4.5.1.jar" />
117+
<Component Win64="yes" Id="cmp5F3CCD0C6935C81E44A85C22491B2B9F" Guid="*">
118+
<File Id="filA5EB719356A791DCF7B7448E46671976" KeyPath="yes" Source="$(var.DsbPath)\jna-platform-4.5.2.jar" />
119119
</Component>
120120
<Component Win64="yes" Id="cmp334A6394C83DBE67F64EA8FBE394B02A" Guid="*">
121121
<File Id="filC8C9899AE5BF1EC370933FC501A7CE8A" KeyPath="yes" Source="$(var.DsbPath)\jsr305-3.0.1.jar" />
122122
</Component>
123-
<Component Win64="yes" Id="cmp1E92F2679DFF6AC0CC78E08562EDE770" Guid="*">
124-
<File Id="fil8BAF505D7D177D70921B0BFEF0D51530" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-1.2.41.jar" />
123+
<Component Win64="yes" Id="cmpF90ACF24D8E7FF969A7009347D850857" Guid="*">
124+
<File Id="filEA29421D2E0230A2C75951110A411981" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-1.2.51.jar" />
125125
</Component>
126-
<Component Win64="yes" Id="cmp800E12726DF2D2AF3F8A5E14F128FECE" Guid="*">
127-
<File Id="filE573B79B63EB4E2E76B62B30C2DE5A53" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-jdk7-1.2.41.jar" />
126+
<Component Win64="yes" Id="cmp433C52AC65AB8DA52D9A475410397B72" Guid="*">
127+
<File Id="fil14677DB0D82DEBD382D7EC5A7A8B428D" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-common-1.2.51.jar" />
128128
</Component>
129-
<Component Win64="yes" Id="cmpD688590255875F0A60B60E9E8F98D107" Guid="*">
130-
<File Id="fil433DD14B4D01F7D3031A4D48B910FDB4" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-jdk8-1.2.41.jar" />
129+
<Component Win64="yes" Id="cmpF3CFE17BEED1762B47A9321D8E482C1A" Guid="*">
130+
<File Id="fil265D5EA0691E866EE39DD40A58C0EC0C" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-jdk7-1.2.51.jar" />
131+
</Component>
132+
<Component Win64="yes" Id="cmp1CFF192927A70EFE32F0E0A4B91B8DA8" Guid="*">
133+
<File Id="fil1BF6EE00729E7FFAF4E9C99FE3E330CC" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-jdk8-1.2.51.jar" />
131134
</Component>
132135
<Component Win64="yes" Id="cmp06A9E5D8D3CCE9BC42F7B3E0DC00E2A7" Guid="*">
133136
<File Id="fil5BC6FDBD5181516455F4630337B42F20" KeyPath="yes" Source="$(var.DsbPath)\logback-classic-1.2.3.jar" />
@@ -141,11 +144,11 @@
141144
<Component Win64="yes" Id="cmp7D49CAB47554563D92415BBD2B8306EE" Guid="*">
142145
<File Id="fil224162E00CC56C898F699143D1EB7E58" KeyPath="yes" Source="$(var.DsbPath)\reactive-streams-1.0.2.jar" />
143146
</Component>
144-
<Component Win64="yes" Id="cmpEFF2C81D791B4900B4758DDD82B64338" Guid="*">
145-
<File Id="fil0F569EEC89935AE6D1B1E73AA96CB3B3" KeyPath="yes" Source="$(var.DsbPath)\richtextfx-0.9.0.jar" />
147+
<Component Win64="yes" Id="cmpF3F034485DE2DB5BE644A66A755B40AA" Guid="*">
148+
<File Id="fil04E4572E60B605BBA720BD343D3278BD" KeyPath="yes" Source="$(var.DsbPath)\richtextfx-0.9.1.jar" />
146149
</Component>
147-
<Component Win64="yes" Id="cmp6132952D2D7A09B345D13CB54D1300B6" Guid="*">
148-
<File Id="fil1D01F12B54876A26D11DECD70BB551E5" KeyPath="yes" Source="$(var.DsbPath)\rxjava-2.1.13.jar" />
150+
<Component Win64="yes" Id="cmp83475D62EA9E170664744129680F39DC" Guid="*">
151+
<File Id="filFA5CC6B95DABD5CCC8E10406A1A70A8A" KeyPath="yes" Source="$(var.DsbPath)\rxjava-2.1.17.jar" />
149152
</Component>
150153
<Component Win64="yes" Id="cmp302899050A059915A570A4EDD4C30927" Guid="*">
151154
<File Id="fil0DE869DEAB500C1EF77843FDF5F59707" KeyPath="yes" Source="$(var.DsbPath)\rxjavafx-2.2.2.jar" />
@@ -165,8 +168,8 @@
165168
<Component Win64="yes" Id="cmp932955BB40A5CC7C265CDACE5CA85919" Guid="*">
166169
<File Id="fil73A09523443524E4AA347478EB97AD79" KeyPath="yes" Source="$(var.DsbPath)\stax2-api-3.1.4.jar" />
167170
</Component>
168-
<Component Win64="yes" Id="cmpA5BA989BEE3EDA348133E87046EDD5B0" Guid="*">
169-
<File Id="fil932D47539B789318F615C417465822F1" KeyPath="yes" Source="$(var.DsbPath)\undofx-2.0.0.jar" />
171+
<Component Win64="yes" Id="cmp212FDF1A78455B6F4886C659E7912564" Guid="*">
172+
<File Id="filD808D2C5409D41E201585CB82C4F29C6" KeyPath="yes" Source="$(var.DsbPath)\undofx-2.1.0.jar" />
170173
</Component>
171174
<Component Win64="yes" Id="cmp54B64BE5301D98B6B53223F2FDEE9399" Guid="*">
172175
<File Id="fil7E671B1C3C66A7A0E9A2260B883AF923" KeyPath="yes" Source="$(var.DsbPath)\wellbehavedfx-0.3.3.jar" />
@@ -196,10 +199,10 @@
196199
<ComponentRef Id="cmpE49A681278EFCE80335A046F51980629" />
197200
<ComponentRef Id="cmp04B8EB55CEE42E119F334CDE22BCA237" />
198201
<ComponentRef Id="cmpFC9F1A459EB94982D02533FB9C9C0663" />
199-
<ComponentRef Id="cmp9A482979A5B4A6872A53B6CE72603DB2" />
200-
<ComponentRef Id="cmpBFD6F3237B9B903B80183A05F11FA9F9" />
201-
<ComponentRef Id="cmpFEA000D3F17A6E43EACFC75D68843B96" />
202-
<ComponentRef Id="cmpA5B4E3B30F661FFEC8759B6CF2A582E1" />
202+
<ComponentRef Id="cmp40B643CB0594FF8A6000A4489D7AB60D" />
203+
<ComponentRef Id="cmp0208B54B5CB1F18EE220536498990134" />
204+
<ComponentRef Id="cmp6E0B2555642AED03CF6D2BBCF3A8F7C5" />
205+
<ComponentRef Id="cmpC8CEB4861737F3C4CFD2DC7F9A690678" />
203206
<ComponentRef Id="cmp67C8CE44E28F997FEAC97FF167229D5B" />
204207
<ComponentRef Id="cmp8E58DEDBF54CD1426A62D1048B23BBE6" />
205208
<ComponentRef Id="cmp9567460C94E8835F3750DD7172F39DE2" />
@@ -218,25 +221,26 @@
218221
<ComponentRef Id="cmpFC0446F9686AF0BF7344F2D9D1C30A57" />
219222
<ComponentRef Id="cmpA2EDB06EEE023136A3814528C24807A1" />
220223
<ComponentRef Id="cmpCD6AD685522DF68D5181FEAD85B297E8" />
221-
<ComponentRef Id="cmp8315E32D185CAE4CD0C6BF66D89B6CD1" />
222-
<ComponentRef Id="cmp59C4F8454CC18F739028870DADE52F1E" />
224+
<ComponentRef Id="cmp97EFDBF9C76488F17C1DCC8BC8DF619F" />
225+
<ComponentRef Id="cmp5F3CCD0C6935C81E44A85C22491B2B9F" />
223226
<ComponentRef Id="cmp334A6394C83DBE67F64EA8FBE394B02A" />
224-
<ComponentRef Id="cmp1E92F2679DFF6AC0CC78E08562EDE770" />
225-
<ComponentRef Id="cmp800E12726DF2D2AF3F8A5E14F128FECE" />
226-
<ComponentRef Id="cmpD688590255875F0A60B60E9E8F98D107" />
227+
<ComponentRef Id="cmpF90ACF24D8E7FF969A7009347D850857" />
228+
<ComponentRef Id="cmp433C52AC65AB8DA52D9A475410397B72" />
229+
<ComponentRef Id="cmpF3CFE17BEED1762B47A9321D8E482C1A" />
230+
<ComponentRef Id="cmp1CFF192927A70EFE32F0E0A4B91B8DA8" />
227231
<ComponentRef Id="cmp06A9E5D8D3CCE9BC42F7B3E0DC00E2A7" />
228232
<ComponentRef Id="cmp2E66FE7608AEE42B0820E081251DCBFB" />
229233
<ComponentRef Id="cmp0ECD51BD3914BAA43635C47E89C1CDAD" />
230234
<ComponentRef Id="cmp7D49CAB47554563D92415BBD2B8306EE" />
231-
<ComponentRef Id="cmpEFF2C81D791B4900B4758DDD82B64338" />
232-
<ComponentRef Id="cmp6132952D2D7A09B345D13CB54D1300B6" />
235+
<ComponentRef Id="cmpF3F034485DE2DB5BE644A66A755B40AA" />
236+
<ComponentRef Id="cmp83475D62EA9E170664744129680F39DC" />
233237
<ComponentRef Id="cmp302899050A059915A570A4EDD4C30927" />
234238
<ComponentRef Id="cmpDB5A744941E00A96FC0741BA14A04FEA" />
235239
<ComponentRef Id="cmpD15958C6F5D4EC2200C58FFCF7BFC108" />
236240
<ComponentRef Id="cmp0F436D4E723A1A62103E533D3109F37B" />
237241
<ComponentRef Id="cmpFD66811BD8ACD5D5DC6DD8DD2E7CDD47" />
238242
<ComponentRef Id="cmp932955BB40A5CC7C265CDACE5CA85919" />
239-
<ComponentRef Id="cmpA5BA989BEE3EDA348133E87046EDD5B0" />
243+
<ComponentRef Id="cmp212FDF1A78455B6F4886C659E7912564" />
240244
<ComponentRef Id="cmp54B64BE5301D98B6B53223F2FDEE9399" />
241245
<ComponentRef Id="cmp38915EC3D8CA6AFB54C1B47A8A4E725E" />
242246
<ComponentRef Id="cmpB3433A5D9791D8A3990CA1DB81D7B837" />

‎Builders/Windows/SetupProject/SetupProject/SetupProject.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
30-
<DefineConstants>Version=5.0.3;DsbPath=..\..\..\..\..\..\..\dsb-gui\build\libs</DefineConstants>
30+
<DefineConstants>Version=5.0.4;DsbPath=..\..\..\..\..\..\..\dsb-gui\build\libs</DefineConstants>
3131
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
3232
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
3333
<SuppressIces>ICE57</SuppressIces>
@@ -53,7 +53,7 @@
5353
</ItemGroup>
5454
<Import Project="$(WixTargetsPath)" />
5555
<PropertyGroup>
56-
<PostBuildEvent>xcopy !(TargetPath) $(SolutionDir)bin\$(TargetName)-5.0.3$(TargetExt)%2a /Y</PostBuildEvent>
56+
<PostBuildEvent>xcopy !(TargetPath) $(SolutionDir)bin\$(TargetName)-5.0.4$(TargetExt)%2a /Y</PostBuildEvent>
5757
</PropertyGroup>
5858
<PropertyGroup>
5959
<PreBuildEvent>call ..\..\..\createDsbExe.bat

‎Builders/Windows/SetupProject/Version.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
using System.Reflection;
22

3-
[assembly: AssemblyVersion("5.0.3.4")]
4-
[assembly: AssemblyFileVersion("5.0.3.4")]
3+
[assembly: AssemblyVersion("5.0.4.3")]
4+
[assembly: AssemblyFileVersion("5.0.4.3")]

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ buildscript {
3232

3333
allprojects {
3434
group = 'com.spectralogic.dsbrowser'
35-
version = '5.0.3'
35+
version = '5.0.4'
3636
}
3737

3838
subprojects {

‎dsb-gui/launch4j.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<launch4jConfig>
33
<dontWrapJar>false</dontWrapJar>
44
<headerType>gui</headerType>
5-
<jar>build\libs\dsb-gui-5.0.3.jar</jar>
5+
<jar>build\libs\dsb-gui-5.0.4.jar</jar>
66
<outfile>build\dsb-gui.exe</outfile>
77
<errTitle></errTitle>
88
<cmdLine></cmdLine>

0 commit comments

Comments
 (0)