Repository: reef Updated Branches: refs/heads/master cb753d77b -> 13e45727a
[REEF-994] Remove "incubating" from lang\cs build files This change: * updates projectUrl in .nuspec files * removes RemoveIncubating in build.props and references to it from .csproj files JIRA: [REEF-994](https://issues.apache.org/jira/browse/REEF-994) Pull request: This closes #699 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/13e45727 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/13e45727 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/13e45727 Branch: refs/heads/master Commit: 13e45727a960dd35b1617c662bf0a5a1eb6c72b8 Parents: cb753d7 Author: Mariia Mykhailova <[email protected]> Authored: Thu Dec 3 11:51:53 2015 -0800 Committer: Dongjoon Hyun <[email protected]> Committed: Fri Dec 4 23:08:04 2015 +0900 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.All/Org.Apache.REEF.All.nuspec | 2 +- .../Common/DriverFolderPreparationHelper.cs | 2 +- lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj | 1 - lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec | 2 +- lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec | 2 +- lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.nuspec | 2 +- .../Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.nuspec | 2 +- .../Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.nuspec | 2 +- lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.nuspec | 2 +- lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.nuspec | 2 +- lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.nuspec | 2 +- lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.nuspec | 2 +- .../Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec | 2 +- lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec | 2 +- lang/cs/build.props | 6 ++---- 15 files changed, 15 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.All/Org.Apache.REEF.All.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.All/Org.Apache.REEF.All.nuspec b/lang/cs/Org.Apache.REEF.All/Org.Apache.REEF.All.nuspec index 65d3219..5ac5f65 100644 --- a/lang/cs/Org.Apache.REEF.All/Org.Apache.REEF.All.nuspec +++ b/lang/cs/Org.Apache.REEF.All/Org.Apache.REEF.All.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Provide single entry point that references all necessary REEF/WAKE/TANG projects.</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs index d422737..93aa752 100644 --- a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs +++ b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs @@ -52,7 +52,7 @@ namespace Org.Apache.REEF.Client.Common // We embed certain binaries in client dll. // Following items in tuples refer to resource names in Org.Apache.REEF.Client.dll // The first resource item contains the name of the file - // such as "reef-bridge-java-0.13.0-incubating-SNAPSHOT-shaded.jar". The second resource + // such as "reef-bridge-java-0.13.0-SNAPSHOT-shaded.jar". The second resource // item contains the byte contents for said file. // Please note that the identifiers below need to be in sync with 2 other files // 1. $(SolutionDir)\Org.Apache.REEF.Client\Properties\Resources.xml http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj index e32d265..0fda57b 100644 --- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj +++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj @@ -240,7 +240,6 @@ under the License. var Version = XDocument.Load(Path.Combine(ProjectFolder, "pom.xml")).Descendants() .Where(x => x.Name.ToString().Contains("version")) .FirstOrDefault().Value; - var shortVer = $(RemoveIncubating) ? Version.Replace("-incubating","") : Version ; var snapshortNumberAsString = ($(SnapshotNumber) >= 0 && $(SnapshotNumber) <=9) ? "0" + $(SnapshotNumber) : $(SnapshotNumber).ToString(); var reefVersion = Version; http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec index 8bebc8b..6448ecf 100644 --- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec +++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Client for REEF.NET</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec index 0ae394e..c9802d3 100644 --- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec +++ b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Reef Common Infrastructure</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.nuspec b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.nuspec index d9fdf7b..9bbbc16 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.nuspec +++ b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Driver for REEF.NET</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.nuspec b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.nuspec index 87abae1..46817bc 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.nuspec +++ b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Evaluator for REEF.NET</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.nuspec b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.nuspec index 26e4b34..6cd74ea 100644 --- a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.nuspec +++ b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>REEF Examples</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.nuspec b/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.nuspec index b64a039..341cd8f 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.nuspec +++ b/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Iterative Map Reduce Update for REEF.</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.nuspec b/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.nuspec index 52de27a..6a100e2 100644 --- a/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.nuspec +++ b/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>I/O Library for Apache REEF</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.nuspec b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.nuspec index 8dcf44e..5b92812 100644 --- a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.nuspec +++ b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Network services for reef</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.nuspec b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.nuspec index 97239f3..29f3251 100644 --- a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.nuspec +++ b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Tang is a dependency injection framework</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec index f9a1127..f96e138 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec +++ b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Common utilities such as logging shared across Reef/Wake/Tang</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec index a7355e6..b04204c 100644 --- a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec +++ b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec @@ -23,7 +23,7 @@ under the License. <authors>The Apache REEF project</authors> <owners>The Apache REEF project</owners> <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.incubator.apache.org/</projectUrl> + <projectUrl>http://reef.apache.org/</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Wake is an event driven framework</description> <copyright>The Apache Software Foundation</copyright> http://git-wip-us.apache.org/repos/asf/reef/blob/13e45727/lang/cs/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.props b/lang/cs/build.props index 86b9711..d0d2ecf 100644 --- a/lang/cs/build.props +++ b/lang/cs/build.props @@ -57,7 +57,6 @@ under the License. <!-- REEF NuGet properties --> <PropertyGroup> - <RemoveIncubating>true</RemoveIncubating> <IsSnapshot>true</IsSnapshot> <SnapshotNumber>02</SnapshotNumber> <PushPackages>false</PushPackages> @@ -106,9 +105,8 @@ under the License. Version = XDocument.Load(Path.Combine(ProjectFolder, "pom.xml")).Descendants() .Where(x => x.Name.ToString().Contains("version")) .FirstOrDefault().Value; - var shortVer = $(RemoveIncubating) ? Version.Replace("-incubating","") : Version ; - var snapshortNumberAsString = ($(SnapshotNumber) >= 0 && $(SnapshotNumber) <=9) ? "0" + $(SnapshotNumber) : $(SnapshotNumber).ToString(); - NugetVersion = $(IsSnapshot) ? shortVer + "-" + snapshortNumberAsString : shortVer.Replace("-SNAPSHOT",""); + var snapshotNumberAsString = ($(SnapshotNumber) >= 0 && $(SnapshotNumber) <=9) ? "0" + $(SnapshotNumber) : $(SnapshotNumber).ToString(); + NugetVersion = $(IsSnapshot) ? Version + "-" + snapshotNumberAsString : Version.Replace("-SNAPSHOT",""); ]]> </Code> </Task>
