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/11/03 10:45:37 UTC
[1/2] brooklyn-client git commit: Re-use pom config from
brooklyn-server
Repository: brooklyn-client
Updated Branches:
refs/heads/master ba2037e06 -> 15b9838d7
Re-use pom config from brooklyn-server
Analogously to brooklyn-library reuse pom configuration from brooklyn-server. While not ideal this allows us to have version and plugin configuration at one place.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/a0730dbc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/a0730dbc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/a0730dbc
Branch: refs/heads/master
Commit: a0730dbc9bc2c917723c71cad3a77e5edc82b7e0
Parents: ba2037e
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Sep 13 17:53:25 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Nov 1 17:06:04 2016 +0200
----------------------------------------------------------------------
cli/pom.xml | 20 ---
pom.xml | 450 +++++--------------------------------------------------
2 files changed, 36 insertions(+), 434 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/a0730dbc/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index 7cfb782..56c3560 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -55,28 +55,10 @@
<target>all</target>
</properties>
- <repositories>
- <!--
- Same as in the parent apache pom. Repeated here in case
- direct parent's pom not found at relativePath. Can't fetch
- the parent from remote repos for snapshot versions - no
- snapshot repos enabled by default.
- -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>process-build-all</id>
@@ -96,7 +78,6 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin.version}</version>
<configuration>
<descriptors>
<descriptor>release/assembly.xml</descriptor>
@@ -116,7 +97,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
<configuration>
<excludes combine.children="append">
<exclude>vendor/**</exclude>
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/a0730dbc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d39a874..bdef030 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,15 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>17</version>
- <relativePath></relativePath> <!-- prevent loading of ../pom.xml as the "parent" -->
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-parent</artifactId>
+ <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../brooklyn-server/parent/</relativePath>
</parent>
- <groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-client</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<packaging>pom</packaging>
<name>Brooklyn Client</name>
@@ -50,10 +48,12 @@
<system>JIRA</system>
<url>https://issues.apache.org/jira/browse/BROOKLYN</url>
</issueManagement>
+
<ciManagement>
<system>Jenkins</system>
<url>https://builds.apache.org/view/Brooklyn/job/brooklyn-client-master/</url>
</ciManagement>
+
<mailingLists>
<mailingList>
<name>Brooklyn Developer List</name>
@@ -67,422 +67,44 @@
</mailingLists>
<properties>
- <brooklyn.version>0.10.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
-
- <org.osgi.core.version>6.0.0</org.osgi.core.version>
-
- <!-- Compilation -->
- <java.version>1.7</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- <!-- Testing Configuration -->
- <includedTestGroups/>
- <excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP,Broken</excludedTestGroups>
- <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
-
- <!-- Dependency Versions -->
- <logback.version>1.0.7</logback.version>
- <slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
- <guava.version>16.0.1</guava.version>
- <resteasy.version>3.0.19.Final</resteasy.version>
- <cxf.version>3.1.4</cxf.version>
- <httpclient.version>4.4.1</httpclient.version>
- <jsr305.version>2.0.1</jsr305.version>
- <gson.version>2.3</gson.version>
- <jetty.version>9.2.13.v20150730</jetty.version>
- <jetty-schemas.version>3.1.M0</jetty-schemas.version>
- <mockwebserver.version>20121111</mockwebserver.version>
-
- <!-- Testing Dependency Versions -->
- <testng.version>6.8.8</testng.version>
- <mockito.version>1.10.8</mockito.version>
- <assertj.version>2.2.0</assertj.version> <!-- v 2.2.0 is being used as v 3.20 introduces Java8 dependencies-->
- <cobertura.plugin.version>2.7</cobertura.plugin.version>
- <surefire.version>2.18.1</surefire.version>
- <plantuml.version>6121</plantuml.version>
- <ant.version>1.8.4</ant.version>
-
- <!-- Build Tool Versions -->
- <maven-war-plugin.version>2.4</maven-war-plugin.version>
- <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
- <maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
- <nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
- <nodejs-maven-binaries.version>0.10.25</nodejs-maven-binaries.version>
- <jasmine-maven-plugin.version>1.3.1.5</jasmine-maven-plugin.version>
- <requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
- <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
-
+ <resteasy.version>3.0.19.Final</resteasy.version>
</properties>
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <!-- JAX-RS 2.0 RESTEasy Implementation -->
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson2-provider</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <!-- / JAX-RS -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>${jsr305.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.mockwebserver</groupId>
- <artifactId>mockwebserver</artifactId>
- <version>${mockwebserver.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ </dependencies>
</dependencyManagement>
+ <repositories>
+ <!--
+ Same as in the parent apache pom. Repeated here in case
+ direct parent's pom not found at relativePath. Can't fetch
+ the parent from remote repos for snapshot versions - no
+ snapshot repos enabled by default.
+ -->
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<modules>
<module>cli</module>
<module>java</module>
</modules>
- <build>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.6.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.10</version>
- <configuration>
- <additionalProjectnatures>
- <projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>
- </additionalProjectnatures>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.18.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- version 2.4+ seems to break eclipse integration as per https://github.com/tesla/m2eclipse-extras/issues/10
- but cannot find issue on GitHub any more - 404 error -->
- <!-- XXX if this version is changed, update the MavenArtifactTest -->
- <version>2.6</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
- <configuration>
- <!-- disabling use because of NPE deploying to sonatype:
- http://stackoverflow.com/questions/888199/why-does-maven-install-fail-during-javadoc-generation
- http://bugs.sun.com/bugdatabase/view_bug.do;jsessionid=ac084ab7f47c4e7f1df2117cecd?bug_id=5101868
- -->
- <use>false</use>
- <links>
- <link>http://download.oracle.com/javaee/6/api</link>
- </links>
- <keywords>true</keywords>
- <author>false</author>
- <quiet>true</quiet>
- <aggregate>false</aggregate>
- <failOnError>false</failOnError>
- <detectLinks/>
- <tags>
- <tag>
- <name>todo</name>
- <placement>a</placement>
- <head>To-do:</head>
- </tag>
- </tags>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>with-dependencies</shadedClassifierName>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- <goal>test-jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <argLine>-Xms768m -Xmx768m -XX:MaxPermSize=256m -verbose:gc</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>maven-replacer-plugin</artifactId>
- <version>1.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.3</version>
- <configuration>
- <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
- <configuration>
- <excludes combine.children="append">
- <!-- Exclude sandbox because not part of distribution: not in tgz, and not uploaded to maven-central -->
- <exclude>sandbox/**</exclude>
- <!-- Exclude release because not part of distribution: not in tgz, and not uploaded to maven-central -->
- <exclude>release/**</exclude>
- <exclude>README.md</exclude>
- <!-- Exclude netbeans config files (not part of the project, but often on users' drives -->
- <exclude>**/nbactions.xml</exclude>
- <exclude>**/nb-configuration.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <!-- This is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.8,)</versionRange>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <versionRange>[2.4.1,)</versionRange>
- <goals>
- <goal>single</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <versionRange>[1.7,)</versionRange>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <versionRange>[1.3.1,)</versionRange>
- <goals>
- <goal>enforce</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.5,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.8,)</versionRange>
- <goals>
- <goal>unpack</goal>
- <goal>copy</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <versionRange>[2.13,)</versionRange>
- <goals>
- <goal>check</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>
[2/2] brooklyn-client git commit: This closes #27
Posted by he...@apache.org.
This closes #27
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/15b9838d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/15b9838d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/15b9838d
Branch: refs/heads/master
Commit: 15b9838d754951bc1227effe0a04b8555de5364f
Parents: ba2037e a0730db
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 3 10:45:32 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Nov 3 10:45:32 2016 +0000
----------------------------------------------------------------------
cli/pom.xml | 20 ---
pom.xml | 450 +++++--------------------------------------------------
2 files changed, 36 insertions(+), 434 deletions(-)
----------------------------------------------------------------------