You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by ju...@apache.org on 2015/03/25 08:21:02 UTC
incubator-reef git commit: [REEF-214]: Remove DotNet profile from the
maven build.
Repository: incubator-reef
Updated Branches:
refs/heads/master 4e13b08a1 -> 763a6271a
[REEF-214]: Remove DotNet profile from the maven build.
This removes the `DotNet` profile from the Maven build:
* `lang/cs/pom.xml` is removed.
* The module `reef-dotnet` is removed from the root POM.
* `finalizeNuspec.ps1` is changed to pick up the version from the root
POM instead of the one in `lang/cs`
JIRA:
[REEF-214](https://issues.apache.org/jira/browse/REEF-214)
Pull Request:
This closes #120
Author: Markus Weimer <we...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/763a6271
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/763a6271
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/763a6271
Branch: refs/heads/master
Commit: 763a6271a1642bed61e28383809cc5ffc20527d4
Parents: 4e13b08
Author: Markus Weimer <we...@apache.org>
Authored: Tue Mar 24 17:46:23 2015 -0700
Committer: Julia Wang <jw...@yahoo.com>
Committed: Wed Mar 25 00:14:41 2015 -0700
----------------------------------------------------------------------
lang/cs/.nuget/finalizeNuspec.ps1 | 4 +-
lang/cs/pom.xml | 90 ----------------------------------
pom.xml | 1 -
3 files changed, 2 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/763a6271/lang/cs/.nuget/finalizeNuspec.ps1
----------------------------------------------------------------------
diff --git a/lang/cs/.nuget/finalizeNuspec.ps1 b/lang/cs/.nuget/finalizeNuspec.ps1
index 825072e..72c3dee 100644
--- a/lang/cs/.nuget/finalizeNuspec.ps1
+++ b/lang/cs/.nuget/finalizeNuspec.ps1
@@ -30,9 +30,9 @@ Function Get-Nuspec-Version {
Extracts the NuGet version number from the pom.xml file in the source directory.
#>
- $pomPath = "$SolutionDir\pom.xml"
+ $pomPath = "$SolutionDir\..\..\pom.xml"
$pom = [xml] (Get-Content $pomPath)
- $version = $pom.project.parent.version -replace '-incubating-SNAPSHOT',''
+ $version = $pom.project.version -replace '-incubating-SNAPSHOT',''
return $version
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/763a6271/lang/cs/pom.xml
----------------------------------------------------------------------
diff --git a/lang/cs/pom.xml b/lang/cs/pom.xml
deleted file mode 100644
index 64896a8..0000000
--- a/lang/cs/pom.xml
+++ /dev/null
@@ -1,90 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>reef-dotnet</artifactId>
- <name>REEF Dot Net</name>
- <description>Reef Dot Net</description>
- <parent>
- <groupId>org.apache.reef</groupId>
- <artifactId>reef-project</artifactId>
- <version>0.11.0-incubating-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>reef-bridge-java</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>DotNet</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <executable>msbuild.exe</executable>
- </configuration>
- <executions>
- <execution>
- <id>clean</id>
- <phase>clean</phase>
- <configuration>
- <arguments>
- <argument>
- ${project.basedir}/Org.Apache.REEF.sln
- </argument>
- <argument>/p:Configuration="Release"</argument>
- <argument>/p:Platform="x64"</argument>
- <argument>/t:Clean</argument>
- </arguments>
- </configuration>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- <execution>
- <id>build</id>
- <phase>compile</phase>
- <configuration>
- <arguments>
- <argument>
- ${project.basedir}/Org.Apache.REEF.sln
- </argument>
- <argument>/p:Configuration="Release"</argument>
- <argument>/p:Platform="x64"</argument>
- </arguments>
- </configuration>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/763a6271/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f913080..99d008c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,7 +623,6 @@ under the License.
</dependencyManagement>
<modules>
- <module>lang/cs</module>
<module>lang/java/reef-annotations</module>
<module>lang/java/reef-bridge-java</module>
<module>lang/java/reef-checkpoint</module>