Repository: incubator-reef Updated Branches: refs/heads/master 0918a67fd -> 20ee916d8
[REEF-571] Remove NuGet for Org.Apache.REEF.Bridge.JAR This addressed the issue by * Removing NuGet package generation from Org.Apache.REEF.Bridge.JAR JIRA: [REEF-571](https://issues.apache.org/jira/browse/REEF-571) Pull Request: This closes #360 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/20ee916d Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/20ee916d Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/20ee916d Branch: refs/heads/master Commit: 20ee916d8740bcbc2633c8025c5c47eb57795415 Parents: 0918a67 Author: Anupam <[email protected]> Authored: Mon Aug 10 11:07:39 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Mon Aug 10 15:54:40 2015 -0700 ---------------------------------------------------------------------- .../Org.Apache.REEF.Bridge.JAR.csproj | 49 ++------------------ .../Org.Apache.REEF.Bridge.JAR.nuspec | 36 -------------- 2 files changed, 5 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/20ee916d/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj index 81e1a57..a9bf66c 100644 --- a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj +++ b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -24,10 +24,8 @@ under the License. <ProjectGuid>{62905C7C-1A7E-4923-B78D-1BF42D7FAD40}</ProjectGuid> <AssemblyName>Org.Apache.REEF.Bridge.JAR</AssemblyName> <RestorePackages>true</RestorePackages> + <BuildPackage>false</BuildPackage> </PropertyGroup> - <ItemGroup> - <None Include="Org.Apache.REEF.Bridge.JAR.nuspec" /> - </ItemGroup> <Import Project="$(SolutionDir)\build.props" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" /> @@ -54,8 +52,8 @@ under the License. <!-- Executes 'mvn install', if the JAR does not exist. --> - <Target Name="Build" - DependsOnTargets="CheckMavenInstall;CheckJavaInstall;CheckProtocInstall" + <Target Name="Build" + DependsOnTargets="CheckMavenInstall;CheckJavaInstall;CheckProtocInstall" Outputs="$(OutputPath)"> <PropertyGroup> <!--The shaded jar of the bridge (driver side) --> @@ -91,41 +89,4 @@ under the License. --> <Target Name="Rebuild" DependsOnTargets="Clean;Build"/> <Target Name="CheckPrerequisites" DependsOnTargets="Build"/> - <Target Name="BuildPackage" Condition="'$(BuildPackage)' == 'true'" DependsOnTargets="ExtractPOMVersion; CheckPrerequisites" AfterTargets="Build"> - - <PropertyGroup> - <BuildCommand>$(NuGetCommand) pack "$(FinalizedNuspecFile)" -BasePath $(NugetProjectPath) -Properties "Configuration=$(Configuration);Platform=$(Platform);REEF_Version=$(REEF_Version);Version=$(REEF_NugetVersion)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" </BuildCommand> - </PropertyGroup> - - <ItemGroup> - <Line Include="line01"><Text>param($installPath, $toolsPath, $package, $project)</Text></Line> - <Line Include="line02"><Text>$file1 = $project.ProjectItems.Item("reef-bridge-java-$(REEF_Version)-shaded.jar")</Text></Line> - <Line Include="line03"><Text>$copyToOutput1 = $file1.Properties.Item("CopyToOutputDirectory")</Text></Line> - <Line Include="line04"><Text>$copyToOutput1.Value = 2</Text></Line> - <!--Copy the client JAR--> - <Line Include="line05"><Text>$file2 = $project.ProjectItems.Item("reef-bridge-client-$(REEF_Version)-shaded.jar")</Text></Line> - <Line Include="line05"><Text>$copyToOutput2 = $file2.Properties.Item("CopyToOutputDirectory")</Text></Line> - <Line Include="line07"><Text>$copyToOutput2.Value = 2</Text></Line> - <LineText Include="%(Line.Text)" /> - </ItemGroup> - - <WriteLinesToFile - File="$(SolutionDir)\bin\$(Platform)\$(Configuration)\$(AssemblyName)\install.ps1" - Lines="@(LineText)" - Overwrite="true" - /> - <Exec Command="$(BuildCommand)" Condition=" '$(OS)' != 'Windows_NT' " /> - <Exec Command="$(BuildCommand)" LogStandardErrorAsError="true" Condition=" '$(OS)' == 'Windows_NT' " /> - </Target> - <Target Name="PushPackages" Condition="'$(PushPackages)' == 'true'" DependsOnTargets="BuildPackage" AfterTargets="BuildPackage"> - <ItemGroup> - <PackageFile Include="$(SolutionDir).nuget\packages\$(RootNamespace).$(REEF_NugetVersion).nupkg" /> - </ItemGroup> - <PropertyGroup> - <PushCommand Condition="'$(NuGetApiKey)' == '' OR '$(NuGetApiKey)' == '*Undefined*'">$(NuGetCommand) push @(PackageFile) -Source $(NuGetRepository)</PushCommand> - <PushCommand Condition="'$(NuGetApiKey)' != '' AND '$(NuGetApiKey)' != '*Undefined*'">$(NuGetCommand) push @(PackageFile) $(NuGetApiKey) -Source $(NuGetRepository)</PushCommand> - </PropertyGroup> - <Exec Condition="'$(BuildPackage)' == 'true'" Command="$(PushCommand)" LogStandardErrorAsError="true"> - </Exec> - </Target> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/20ee916d/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.nuspec b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.nuspec deleted file mode 100644 index 9b0d5b9..0000000 --- a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.nuspec +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<package > - <metadata> - <id>Org.Apache.REEF.Bridge.JAR</id> - <version>$version$</version> - <title>Org.Apache.REEF.Bridge.JAR</title> - <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> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>The Java side of the REEF Bridge. Note that this contains all its dependencies as well.</description> - <copyright>The Apache Software Foundation and the respective owners of the packaged libraries.</copyright> - </metadata> - <files> - <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Bridge.JAR\reef-bridge-java-$REEF_Version$-shaded.jar" target="content" /> - <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Bridge.JAR\reef-bridge-client-$REEF_Version$-shaded.jar" target="content" /> - <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Bridge.JAR\install.ps1" target="tools" /> - </files> -</package>
