You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/10 13:53:11 UTC
[3/7] brooklyn-client git commit: project now excluded in maven build
by a property, in the uber pom rather than here
project now excluded in maven build by a property, in the uber pom rather than here
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/e9259bf1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/e9259bf1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/e9259bf1
Branch: refs/heads/master
Commit: e9259bf171401e56adb5585efd3e65310d85a8de
Parents: d9b2079
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Mar 10 10:42:28 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Mar 10 10:42:28 2016 +0000
----------------------------------------------------------------------
pom.xml | 121 ++++++++++++++++++++++----------------------------
release/build.sh | 4 +-
2 files changed, 55 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/e9259bf1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cdf21ad..8bcb9c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,75 +50,60 @@
<target>all</target>
</properties>
-
- <profiles>
-
- <profile>
- <id>no-go-client</id>
- </profile>
-
- <profile>
- <id>go-client</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>process-build-all</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <ant target="${target}"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>process-build-all</id>
+ <phase>compile</phase>
<configuration>
- <excludes combine.children="append">
- <exclude>**/br/Godeps/**/*</exclude>
- </excludes>
+ <target>
+ <ant target="${target}"/>
+ </target>
</configuration>
- </plugin>
-
- </plugins>
-
- </build>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin.version}</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.11</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/br/Godeps/**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/e9259bf1/release/build.sh
----------------------------------------------------------------------
diff --git a/release/build.sh b/release/build.sh
index 7b3d62a..b82dfbd 100755
--- a/release/build.sh
+++ b/release/build.sh
@@ -141,7 +141,7 @@ if ! command -v $GOBIN >/dev/null 2>&1 ; then
ERROR: Go language binaries not found (running "$GOBIN")
The binaries for go v1.6 must be installed to build the brooklyn-client CLI.
-See golang.org for more information, or run maven with '-Pno-go-client' to skip.
+See golang.org for more information, or run maven with '-Dno-go-client' to skip.
--MARKER--
exit 1
@@ -157,7 +157,7 @@ if ! (( "$GO_V" >= 6 )) ; then
ERROR: Incompatible Go language version: $GO_VERSION
Go version 1.6 or higher is required to build the brooklyn-client CLI.
-See golang.org for more information, or run maven with '-Pno-go-client' to skip.
+See golang.org for more information, or run maven with '-Dno-go-client' to skip.
--MARKER--
exit 1