Skip to content
This repository was archived by the owner on Aug 4, 2022. It is now read-only.

Commit b37cc1f

Browse files
taegeonumMarkus Weimer
taegeonum
authored and
Markus Weimer
committed
[REEF-1848] Update version to 0.17.0-SNAPSHOT
 * Update versions to 0.17-SNAPSHOT for POM and all other files * Add build.DotNet.props and ReefOnSpark.scala in change_version.py JIRA: [REEF-1848](https://issues.apache.org/jira/browse/REEF-1848) Pull Request: This closes #1353
1 parent 93ef501 commit b37cc1f

File tree

47 files changed

+111
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+111
-51
lines changed

‎Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
DOXYFILE_ENCODING = UTF-8
2323
PROJECT_NAME = "Apache REEF"
24-
PROJECT_NUMBER = 0.16.0-SNAPSHOT
24+
PROJECT_NUMBER = 0.17.0-SNAPSHOT
2525
PROJECT_BRIEF = "Retainable Evaluator Execution Framework"
2626
OUTPUT_DIRECTORY = target
2727
JAVADOC_AUTOBRIEF = YES

‎dev/change_version.py

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,60 @@ def change_assembly_info_cs(file, new_version):
145145
f.write(changed_str)
146146
f.close()
147147

148+
"""
149+
Change Version in lang/cs/build.DotNet.props
150+
"""
151+
def change_dotnet_props_cs(file, new_version):
152+
changed_str = ""
153+
new_version = new_version
154+
if "SNAPSHOT" in new_version:
155+
new_version = new_version.split("-")[0]
156+
157+
f = open(file, 'r')
158+
r = re.compile('<Version>(.*?)</Version>')
159+
160+
while True:
161+
line = f.readline()
162+
if not line:
163+
break
164+
if "<Version>" in line and "</Version>" in line:
165+
m = r.search(line)
166+
old_version = m.group(1)
167+
changed_str += line.replace(old_version, new_version)
168+
else:
169+
changed_str += line
170+
f.close()
171+
172+
f = open(file, 'w')
173+
f.write(changed_str)
174+
f.close()
175+
176+
"""
177+
Change ReefOnSpark.scala in lang/scala/reef-examples-scala/.../hellospark/ReefOnSpark.scala
178+
"""
179+
def change_reef_on_spark_scala(file, new_version):
180+
changed_str = ""
181+
182+
f = open(file, 'r')
183+
184+
while True:
185+
line = f.readline()
186+
if not line:
187+
break
188+
if "reef-examples-spark" in line and "-shaded.jar":
189+
r = re.compile("//.*reef-examples-spark-(.*?)-shaded\.jar")
190+
m = r.search(line)
191+
old_version = m.group(1)
192+
changed_str += line.replace(old_version, new_version)
193+
else:
194+
changed_str += line
195+
f.close()
196+
197+
f = open(file, 'w')
198+
f.write(changed_str)
199+
f.close()
200+
201+
148202
"""
149203
Read 'IsSnapshot' from lang/cs/build.props
150204
"""
@@ -287,6 +341,12 @@ def change_version(reef_home, new_version, pom_only):
287341
change_project_number_Doxyfile(reef_home + "/Doxyfile", new_version)
288342
print reef_home + "/Doxyfile"
289343

344+
change_dotnet_props_cs(reef_home + "/lang/cs/build.DotNet.props", new_version)
345+
print reef_home + "/lang/cs/build.DotNet.props"
346+
347+
change_reef_on_spark_scala(reef_home + "/lang/scala/reef-examples-scala/src/main/scala/org/apache/reef/examples/hellospark/ReefOnSpark.scala", new_version)
348+
print reef_home + "/lang/scala/reef-examples-scala/src/main/scala/org/apache/reef/examples/hellospark/ReefOnSpark.scala"
349+
290350
if __name__ == "__main__":
291351
parser = argparse.ArgumentParser(description="Script for changing REEF version in all files that use it")
292352
parser.add_argument("reef_home", type=str, help="REEF home")

‎lang/cs/Org.Apache.REEF.Bridge/AssemblyInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ using namespace System::Security::Permissions;
4949
// by using the '*' as shown below:
5050

5151
//[assembly:AssemblyVersionAttribute("1.0.*")];
52-
[assembly:AssemblyVersionAttribute("0.16.0.0")];
53-
[assembly:AssemblyFileVersion("0.16.0.0")]
52+
[assembly:AssemblyVersionAttribute("0.17.0.0")];
53+
[assembly:AssemblyFileVersion("0.17.0.0")]
5454
[assembly:ComVisible(false)];
5555

5656
[assembly:CLSCompliantAttribute(true)];

‎lang/cs/Org.Apache.REEF.Client/Properties/Resources.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,20 @@ This file is used to embed JAR files to client dll
8080
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
8181
</resheader>
8282
<data name="ClientJarFullName" xml:space="preserve">
83-
<value>reef-bridge-client-0.16.0-SNAPSHOT-shaded.jar</value>
83+
<value>reef-bridge-client-0.17.0-SNAPSHOT-shaded.jar</value>
8484
</data>
8585
<data name="DriverJarFullName" xml:space="preserve">
86-
<value>reef-bridge-java-0.16.0-SNAPSHOT-shaded.jar</value>
86+
<value>reef-bridge-java-0.17.0-SNAPSHOT-shaded.jar</value>
8787
</data>
8888
<data name="ClrDriverFullName" xml:space="preserve">
8989
<value>Org.Apache.REEF.ClrDriver.exe</value>
9090
</data>
9191
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
9292
<data name="reef_bridge_client" type="System.Resources.ResXFileRef, System.Windows.Forms">
93-
<value>E:\src\reef\lang\cs\bin\x64\Debug\Org.Apache.REEF.Bridge.JAR\reef-bridge-client-0.16.0-SNAPSHOT-shaded.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
93+
<value>E:\src\reef\lang\cs\bin\x64\Debug\Org.Apache.REEF.Bridge.JAR\reef-bridge-client-0.17.0-SNAPSHOT-shaded.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
9494
</data>
9595
<data name="reef_bridge_driver" type="System.Resources.ResXFileRef, System.Windows.Forms">
96-
<value>E:\src\reef\lang\cs\bin\x64\Debug\Org.Apache.REEF.Bridge.JAR\reef-bridge-java-0.16.0-SNAPSHOT-shaded.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
96+
<value>E:\src\reef\lang\cs\bin\x64\Debug\Org.Apache.REEF.Bridge.JAR\reef-bridge-java-0.17.0-SNAPSHOT-shaded.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
9797
</data>
9898
<data name="reef_clrdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
9999
<value>E:\src\reef\lang\cs\bin\x64\Debug\Org.Apache.REEF.ClrDriver\Org.Apache.REEF.ClrDriver.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

‎lang/cs/Org.Apache.REEF.Client/run.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
::
3939

4040
:: RUNTIME
41-
set SHADED_JAR=.\reef-bridge-java-0.16.0-SNAPSHOT-shaded.jar
41+
set SHADED_JAR=.\reef-bridge-java-0.17.0-SNAPSHOT-shaded.jar
4242

4343
set LOGGING_CONFIG=-Djava.util.logging.config.class=org.apache.reef.util.logging.CLRLoggingConfig
4444

‎lang/cs/Org.Apache.REEF.ClrDriver/AssemblyInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ using namespace System::Security::Permissions;
4848
// by using the '*' as shown below:
4949

5050
[assembly:AssemblyVersion("0.14.0.0")]
51-
[assembly:AssemblyFileVersion("0.16.0.0")]
51+
[assembly:AssemblyFileVersion("0.17.0.0")]
5252

5353
[assembly:ComVisible(false)];
5454

‎lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static class DriverConfigGenerator
4242
/// <summary>
4343
/// The bridge JAR name.
4444
/// </summary>
45-
public const string JavaBridgeJarFileName = "reef-bridge-java-0.16.0-SNAPSHOT-shaded.jar";
45+
public const string JavaBridgeJarFileName = "reef-bridge-java-0.17.0-SNAPSHOT-shaded.jar";
4646

4747
private static readonly Logger Log = Logger.GetLogger(typeof(DriverConfigGenerator));
4848

‎lang/cs/SharedAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// COM, set the ComVisible attribute to true on that type.
3030
[assembly: ComVisible(false)]
3131

32-
[assembly: AssemblyVersion("0.16.0.0")]
33-
[assembly: AssemblyFileVersion("0.16.0.0")]
32+
[assembly: AssemblyVersion("0.17.0.0")]
33+
[assembly: AssemblyFileVersion("0.17.0.0")]

‎lang/cs/build.DotNet.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ specific language governing permissions and limitations
1616
under the License.
1717
-->
1818
<PropertyGroup>
19-
<Version>0.16.0</Version>
19+
<Version>0.17.0</Version>
2020
<Authors>Apache Software Foundation</Authors>
2121
<Owners>The Apache REEF project</Owners>
2222
<Product>Apache REEF</Product>

‎lang/cs/build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ under the License.
5959
<!-- REEF NuGet properties -->
6060
<PropertyGroup>
6161
<IsSnapshot>true</IsSnapshot>
62-
<SnapshotNumber>06</SnapshotNumber>
62+
<SnapshotNumber>01</SnapshotNumber>
6363
<PushPackages>false</PushPackages>
6464
<NuGetRepository>https://www.nuget.org</NuGetRepository>
6565
<NuGetError>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</NuGetError>

0 commit comments

Comments
 (0)