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

Commit

Permalink
[REEF-1848] Update version to 0.17.0-SNAPSHOT
Browse files Browse the repository at this point in the history
  * 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
  • Loading branch information
taegeonum authored and Markus Weimer committed Aug 8, 2017
1 parent 93ef501 commit b37cc1f
Show file tree
Hide file tree
Showing 47 changed files with 111 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "Apache REEF"
PROJECT_NUMBER = 0.16.0-SNAPSHOT
PROJECT_NUMBER = 0.17.0-SNAPSHOT
PROJECT_BRIEF = "Retainable Evaluator Execution Framework"
OUTPUT_DIRECTORY = target
JAVADOC_AUTOBRIEF = YES
Expand Down
60 changes: 60 additions & 0 deletions dev/change_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,60 @@ def change_assembly_info_cs(file, new_version):
f.write(changed_str)
f.close()

"""
Change Version in lang/cs/build.DotNet.props
"""
def change_dotnet_props_cs(file, new_version):
changed_str = ""
new_version = new_version
if "SNAPSHOT" in new_version:
new_version = new_version.split("-")[0]

f = open(file, 'r')
r = re.compile('<Version>(.*?)</Version>')

while True:
line = f.readline()
if not line:
break
if "<Version>" in line and "</Version>" in line:
m = r.search(line)
old_version = m.group(1)
changed_str += line.replace(old_version, new_version)
else:
changed_str += line
f.close()

f = open(file, 'w')
f.write(changed_str)
f.close()

"""
Change ReefOnSpark.scala in lang/scala/reef-examples-scala/.../hellospark/ReefOnSpark.scala
"""
def change_reef_on_spark_scala(file, new_version):
changed_str = ""

f = open(file, 'r')

while True:
line = f.readline()
if not line:
break
if "reef-examples-spark" in line and "-shaded.jar":
r = re.compile("//.*reef-examples-spark-(.*?)-shaded\.jar")
m = r.search(line)
old_version = m.group(1)
changed_str += line.replace(old_version, new_version)
else:
changed_str += line
f.close()

f = open(file, 'w')
f.write(changed_str)
f.close()


"""
Read 'IsSnapshot' from lang/cs/build.props
"""
Expand Down Expand Up @@ -287,6 +341,12 @@ def change_version(reef_home, new_version, pom_only):
change_project_number_Doxyfile(reef_home + "/Doxyfile", new_version)
print reef_home + "/Doxyfile"

change_dotnet_props_cs(reef_home + "/lang/cs/build.DotNet.props", new_version)
print reef_home + "/lang/cs/build.DotNet.props"

change_reef_on_spark_scala(reef_home + "/lang/scala/reef-examples-scala/src/main/scala/org/apache/reef/examples/hellospark/ReefOnSpark.scala", new_version)
print reef_home + "/lang/scala/reef-examples-scala/src/main/scala/org/apache/reef/examples/hellospark/ReefOnSpark.scala"

if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Script for changing REEF version in all files that use it")
parser.add_argument("reef_home", type=str, help="REEF home")
Expand Down
4 changes: 2 additions & 2 deletions lang/cs/Org.Apache.REEF.Bridge/AssemblyInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ using namespace System::Security::Permissions;
// by using the '*' as shown below:

//[assembly:AssemblyVersionAttribute("1.0.*")];
[assembly:AssemblyVersionAttribute("0.16.0.0")];
[assembly:AssemblyFileVersion("0.16.0.0")]
[assembly:AssemblyVersionAttribute("0.17.0.0")];
[assembly:AssemblyFileVersion("0.17.0.0")]
[assembly:ComVisible(false)];

[assembly:CLSCompliantAttribute(true)];
8 changes: 4 additions & 4 deletions lang/cs/Org.Apache.REEF.Client/Properties/Resources.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,20 @@ This file is used to embed JAR files to client dll
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ClientJarFullName" xml:space="preserve">
<value>reef-bridge-client-0.16.0-SNAPSHOT-shaded.jar</value>
<value>reef-bridge-client-0.17.0-SNAPSHOT-shaded.jar</value>
</data>
<data name="DriverJarFullName" xml:space="preserve">
<value>reef-bridge-java-0.16.0-SNAPSHOT-shaded.jar</value>
<value>reef-bridge-java-0.17.0-SNAPSHOT-shaded.jar</value>
</data>
<data name="ClrDriverFullName" xml:space="preserve">
<value>Org.Apache.REEF.ClrDriver.exe</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="reef_bridge_client" type="System.Resources.ResXFileRef, System.Windows.Forms">
<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>
<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>
</data>
<data name="reef_bridge_driver" type="System.Resources.ResXFileRef, System.Windows.Forms">
<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>
<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>
</data>
<data name="reef_clrdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
<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>
Expand Down
2 changes: 1 addition & 1 deletion lang/cs/Org.Apache.REEF.Client/run.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
::

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

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

Expand Down
2 changes: 1 addition & 1 deletion lang/cs/Org.Apache.REEF.ClrDriver/AssemblyInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ using namespace System::Security::Permissions;
// by using the '*' as shown below:

[assembly:AssemblyVersion("0.14.0.0")]
[assembly:AssemblyFileVersion("0.16.0.0")]
[assembly:AssemblyFileVersion("0.17.0.0")]

[assembly:ComVisible(false)];

Expand Down
2 changes: 1 addition & 1 deletion lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static class DriverConfigGenerator
/// <summary>
/// The bridge JAR name.
/// </summary>
public const string JavaBridgeJarFileName = "reef-bridge-java-0.16.0-SNAPSHOT-shaded.jar";
public const string JavaBridgeJarFileName = "reef-bridge-java-0.17.0-SNAPSHOT-shaded.jar";

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

Expand Down
4 changes: 2 additions & 2 deletions lang/cs/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

[assembly: AssemblyVersion("0.16.0.0")]
[assembly: AssemblyFileVersion("0.16.0.0")]
[assembly: AssemblyVersion("0.17.0.0")]
[assembly: AssemblyFileVersion("0.17.0.0")]
2 changes: 1 addition & 1 deletion lang/cs/build.DotNet.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ specific language governing permissions and limitations
under the License.
-->
<PropertyGroup>
<Version>0.16.0</Version>
<Version>0.17.0</Version>
<Authors>Apache Software Foundation</Authors>
<Owners>The Apache REEF project</Owners>
<Product>Apache REEF</Product>
Expand Down
2 changes: 1 addition & 1 deletion lang/cs/build.props
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ under the License.
<!-- REEF NuGet properties -->
<PropertyGroup>
<IsSnapshot>true</IsSnapshot>
<SnapshotNumber>06</SnapshotNumber>
<SnapshotNumber>01</SnapshotNumber>
<PushPackages>false</PushPackages>
<NuGetRepository>https://www.nuget.org</NuGetRepository>
<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>
Expand Down
2 changes: 1 addition & 1 deletion lang/cs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion lang/java/reef-annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-applications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-applications/reef-vortex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-applications</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-bridge-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-bridge-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-checkpoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
<artifactId>reef-checkpoint</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-examples-clr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-examples-hdinsight/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-experimental/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-poison/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-runtime-hdinsight/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-runtime-local/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-runtime-mesos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-runtime-multi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
<name>REEF Runtime for multiple runtime scenarios</name>
Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-runtime-standalone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-runtime-yarn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-tang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>reef-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-tang/tang-test-jarA/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>tang-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
</parent>

<artifactId>tang-test-jarA</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-tang/tang-test-jarAB/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>tang-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
</parent>

<artifactId>tang-test-jarAB</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-tang/tang-test-jarB-conflictA/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>tang-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
</parent>

<artifactId>tang-test-jarB-conflictA</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lang/java/reef-tang/tang-test-jarB/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.reef</groupId>
<artifactId>tang-project</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
</parent>

<artifactId>tang-test-jarB</artifactId>
Expand Down
Loading

0 comments on commit b37cc1f

Please sign in to comment.