Repository: usergrid Updated Branches: refs/heads/master 3bb61da1a -> 2455b6a65
POM updates to not filter .p12 files. Also reformatted the XML files for cleanliness. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/868db4d6 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/868db4d6 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/868db4d6 Branch: refs/heads/master Commit: 868db4d68819a49fd4c18ec69f9a16fcd628a75b Parents: 95fa520 Author: Michael Russo <michaelaru...@gmail.com> Authored: Mon Jan 11 17:51:26 2016 -0800 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Mon Jan 11 17:51:26 2016 -0800 ---------------------------------------------------------------------- stack/rest/pom.xml | 32 +- stack/services/pom.xml | 889 ++++++++++++++++++++++---------------------- 2 files changed, 481 insertions(+), 440 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/868db4d6/stack/rest/pom.xml ---------------------------------------------------------------------- diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml index f0ce7b3..e7905c9 100644 --- a/stack/rest/pom.xml +++ b/stack/rest/pom.xml @@ -51,12 +51,23 @@ </resources> <testResources> + <!-- the filtering causes corruption in the p12 files, so exclude them in filtering and copy without filtering --> <testResource> <directory>src/test/resources</directory> <filtering>true</filtering> <includes> <include>**/*</include> </includes> + <excludes> + <exclude>**/*.p12</exclude> + </excludes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*.p12</include> + </includes> </testResource> </testResources> @@ -79,12 +90,16 @@ <threadCount>${usergrid.rest.threads}</threadCount> <useSystemClassLoader>false</useSystemClassLoader> <reuseForks>true</reuseForks> - <argLine>-Dwebapp.directory=${basedir}/src/main/webapp -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar -Djava.util.logging.config.file=${basedir}/src/test/resources/logging.properties ${ug.argline} + <argLine>-Dwebapp.directory=${basedir}/src/main/webapp + -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} + -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 + -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar + -Djava.util.logging.config.file=${basedir}/src/test/resources/logging.properties ${ug.argline} </argLine> <includes> <include>**/*IT.java</include> <include>**/*Test.java</include> - </includes> + </includes> <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups> </configuration> @@ -422,8 +437,17 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.plugin.version}</version> <configuration> - <argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec -Dwebapp.directory=${basedir}/src/main/webapp -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar -Djava.util.logging.config.file=${basedir}/src/test/resources/logging.properties ${ug.argline}</argLine> - <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups> + <argLine> + -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec + -Dwebapp.directory=${basedir}/src/main/webapp + -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true + -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 + -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar + -Djava.util.logging.config.file=${basedir}/src/test/resources/logging.properties + ${ug.argline} + </argLine> + <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest + </excludedGroups> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/usergrid/blob/868db4d6/stack/services/pom.xml ---------------------------------------------------------------------- diff --git a/stack/services/pom.xml b/stack/services/pom.xml index 9660894..7189eb4 100644 --- a/stack/services/pom.xml +++ b/stack/services/pom.xml @@ -17,442 +17,453 @@ --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid</artifactId> - <version>2.1.1-SNAPSHOT</version> - <relativePath>../</relativePath> - </parent> - - <!-- Override these properties in your settings.xml in an active profile --> - <properties> - - </properties> - - <artifactId>usergrid-services</artifactId> - <name>Usergrid Services</name> - <description>Service layer for Usergrid system.</description> - <packaging>jar</packaging> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - - - <!-- PROFILES --> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - </includes> - </resource> - <resource> - <directory>src/main/python</directory> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.yaml</include> - <include>**/*.xml</include> - <include>**/*.properties</include> - <include>**/*.p12</include> - <include>**/*.json</include> - </includes> - </testResource> - <testResource> - <directory>src/main/python</directory> - </testResource> - </testResources> - - <plugins> - - <!-- - Need to override parent's surefire plugin here to set system properties. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.plugin.version}</version> - <configuration> - <systemPropertyVariables> - <storage-config>${basedir}/src/test/conf</storage-config> - <target.directory>${project.build.directory}</target.directory> - </systemPropertyVariables> - <parallel>${usergrid.it.parallel}</parallel> - <forkCount>${usergrid.it.forkCount}</forkCount> - <threadCount>${usergrid.it.threads}</threadCount> - <reuseForks>${usergrid.it.reuseForks}</reuseForks> - <useSystemClassLoader>false</useSystemClassLoader> - <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} - </argLine> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath>../</relativePath> + </parent> + + <!-- Override these properties in your settings.xml in an active profile --> + <properties> + + </properties> + + <artifactId>usergrid-services</artifactId> + <name>Usergrid Services</name> + <description>Service layer for Usergrid system.</description> + <packaging>jar</packaging> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + </plugins> + </reporting> + + + <!-- PROFILES --> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> <includes> - <include>**/*IT.java</include> - <include>**/*Test.java</include> + <include>**/*.xml</include> </includes> - <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups> - </configuration> - <dependencies> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>${surefire.plugin.artifactName}</artifactId> - <version>${surefire.plugin.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.0.21</version> - </dependency> - </dependencies> - - </plugin> - - </plugins> - </build> - - <dependencies> - - <!-- Usergrid Dependencies --> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid-config</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.mindrot</groupId> - <artifactId>jbcrypt</artifactId> - </dependency> - - <!-- Apache Dependencies --> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-spring</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.amber</groupId> - <artifactId>amber-oauth2-common</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.amber</groupId> - <artifactId>amber-oauth2-authzserver</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.amber</groupId> - <artifactId>amber-oauth2-resourceserver</artifactId> - </dependency> - - <!-- SUN, Javax Package and Other Com Dependencies --> - - <!-- Required only when you are using JAX-RS Client --> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <version>2.21</version> - </dependency> - - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson</artifactId> - <version>2.21</version> - </dependency> - - <!--<dependency>--> - <!--<groupId>com.sun.jersey</groupId>--> - <!--<artifactId>jersey-core</artifactId>--> - <!--</dependency>--> - - <!--<dependency>--> - <!--<groupId>com.sun.jersey</groupId>--> - <!--<artifactId>jersey-client</artifactId>--> - <!--</dependency>--> - - <!--<dependency>--> - <!--<groupId>com.sun.jersey</groupId>--> - <!--<artifactId>jersey-json</artifactId>--> - <!--</dependency>--> - - <!-- Codehaus, JClouds, Spring and Other Org Dependencies --> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - </dependency> - - <dependency> - <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-s3</artifactId> - <!--<exclusions>--> - <!--<exclusion>--> - <!--<artifactId>jackson-databind</artifactId>--> - <!--<groupId>com.fasterxml.jackson.core</groupId>--> - <!--</exclusion>--> - <!--</exclusions>--> - </dependency> - - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-blobstore</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <exclusions> - <exclusion> - <artifactId>guice-assistedinject</artifactId> - <groupId>com.google.inject.extensions</groupId> - </exclusion> - <exclusion> - <artifactId>guice</artifactId> - <groupId>com.google.inject</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-allblobstore</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.jclouds.driver</groupId> - <artifactId>jclouds-netty</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.jclouds.driver</groupId> - <artifactId>jclouds-apachehc</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.jclouds.driver</groupId> - <artifactId>jclouds-log4j</artifactId> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.jclouds.driver</groupId> - <artifactId>jclouds-slf4j</artifactId> - </dependency> - - <dependency> - <groupId>org.python</groupId> - <artifactId>jython</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - </dependency> - - <!-- Testing and Logging Dependencies --> - <dependency> - <!-- - Do not remove this slf4j-api dependency remove even though pulled - in transitively. If not present IntelliJ IDEA wigs out. - --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid-core</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>${project.parent.groupId}</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid-config</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid-test-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jvnet.mock-javamail</groupId> - <artifactId>mock-javamail</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4-rule-agent</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hectorclient</groupId> - <artifactId>hector-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.relayrides</groupId> - <artifactId>pushy</artifactId> - <!-- The sha in the version is the git commit used in this build. Check out the pushy source, then this commit to build the library locally --> - <version>0.4</version> - </dependency> - - <dependency> - <groupId>io.apigee.gcm</groupId> - <artifactId>gcm-server</artifactId> - </dependency> - - <dependency> - <groupId>com.clearspring.analytics</groupId> - <artifactId>stream</artifactId> - <version>2.7.0</version> - </dependency> - <!-- fork: https://github.com/apigee/java-wns/tree/1.2-USERGRID --> - <!-- forked to eliminate jackson dependency issues --> - <dependency> - <groupId>com.github.fernandospr</groupId> - <artifactId>java-wns</artifactId> - <version>1.2-USERGRID</version> - </dependency> - </dependencies> + </resource> + <resource> + <directory>src/main/python</directory> + </resource> + </resources> + <testResources> + <!-- the filtering causes corruption in the p12 files, so exclude them in filtering and copy without filtering --> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.yaml</include> + <include>**/*.xml</include> + <include>**/*.properties</include> + <include>**/*.json</include> + </includes> + <excludes> + <exclude>**/*.p12</exclude> + </excludes> + </testResource> + <testResource> + <directory>src/main/python</directory> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*.p12</include> + </includes> + </testResource> + </testResources> + + <plugins> + + <!-- + Need to override parent's surefire plugin here to set system properties. + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.plugin.version}</version> + <configuration> + <systemPropertyVariables> + <storage-config>${basedir}/src/test/conf</storage-config> + <target.directory>${project.build.directory}</target.directory> + </systemPropertyVariables> + <parallel>${usergrid.it.parallel}</parallel> + <forkCount>${usergrid.it.forkCount}</forkCount> + <threadCount>${usergrid.it.threads}</threadCount> + <reuseForks>${usergrid.it.reuseForks}</reuseForks> + <useSystemClassLoader>false</useSystemClassLoader> + <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true + -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 + -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar + ${ug.argline} + </argLine> + <includes> + <include>**/*IT.java</include> + <include>**/*Test.java</include> + </includes> + <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>${surefire.plugin.artifactName}</artifactId> + <version>${surefire.plugin.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>3.0.21</version> + </dependency> + </dependencies> + + </plugin> + + </plugins> + </build> + + <dependencies> + + <!-- Usergrid Dependencies --> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid-config</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid-core</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.mindrot</groupId> + <artifactId>jbcrypt</artifactId> + </dependency> + + <!-- Apache Dependencies --> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-spring</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.amber</groupId> + <artifactId>amber-oauth2-common</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.amber</groupId> + <artifactId>amber-oauth2-authzserver</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.amber</groupId> + <artifactId>amber-oauth2-resourceserver</artifactId> + </dependency> + + <!-- SUN, Javax Package and Other Com Dependencies --> + + <!-- Required only when you are using JAX-RS Client --> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <version>2.21</version> + </dependency> + + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + <version>2.21</version> + </dependency> + + <!--<dependency>--> + <!--<groupId>com.sun.jersey</groupId>--> + <!--<artifactId>jersey-core</artifactId>--> + <!--</dependency>--> + + <!--<dependency>--> + <!--<groupId>com.sun.jersey</groupId>--> + <!--<artifactId>jersey-client</artifactId>--> + <!--</dependency>--> + + <!--<dependency>--> + <!--<groupId>com.sun.jersey</groupId>--> + <!--<artifactId>jersey-json</artifactId>--> + <!--</dependency>--> + + <!-- Codehaus, JClouds, Spring and Other Org Dependencies --> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + </dependency> + + <dependency> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-s3</artifactId> + <!--<exclusions>--> + <!--<exclusion>--> + <!--<artifactId>jackson-databind</artifactId>--> + <!--<groupId>com.fasterxml.jackson.core</groupId>--> + <!--</exclusion>--> + <!--</exclusions>--> + </dependency> + + <dependency> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-blobstore</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-core</artifactId> + <exclusions> + <exclusion> + <artifactId>guice-assistedinject</artifactId> + <groupId>com.google.inject.extensions</groupId> + </exclusion> + <exclusion> + <artifactId>guice</artifactId> + <groupId>com.google.inject</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-allblobstore</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.jclouds.driver</groupId> + <artifactId>jclouds-netty</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.jclouds.driver</groupId> + <artifactId>jclouds-apachehc</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.jclouds.driver</groupId> + <artifactId>jclouds-log4j</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.jclouds.driver</groupId> + <artifactId>jclouds-slf4j</artifactId> + </dependency> + + <dependency> + <groupId>org.python</groupId> + <artifactId>jython</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + </dependency> + + <!-- Testing and Logging Dependencies --> + <dependency> + <!-- + Do not remove this slf4j-api dependency remove even though pulled + in transitively. If not present IntelliJ IDEA wigs out. + --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid-core</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + + <dependency> + <groupId>${project.parent.groupId}</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid-config</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid-test-utils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jvnet.mock-javamail</groupId> + <artifactId>mock-javamail</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4-rule-agent</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hectorclient</groupId> + <artifactId>hector-test</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.relayrides</groupId> + <artifactId>pushy</artifactId> + <!-- The sha in the version is the git commit used in this build. Check out the pushy source, then this commit to build the library locally --> + <version>0.4</version> + </dependency> + + <dependency> + <groupId>io.apigee.gcm</groupId> + <artifactId>gcm-server</artifactId> + </dependency> + + <dependency> + <groupId>com.clearspring.analytics</groupId> + <artifactId>stream</artifactId> + <version>2.7.0</version> + </dependency> + <!-- fork: https://github.com/apigee/java-wns/tree/1.2-USERGRID --> + <!-- forked to eliminate jackson dependency issues --> + <dependency> + <groupId>com.github.fernandospr</groupId> + <artifactId>java-wns</artifactId> + <version>1.2-USERGRID</version> + </dependency> + </dependencies> <!-- Need jacoco profile here because we override the parent's surefire plugin settings above. @@ -467,8 +478,14 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.plugin.version}</version> <configuration> - <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine> - <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups> + <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true + -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 + -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar + ${ug.argline} + -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec + </argLine> + <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest + </excludedGroups> </configuration> </plugin> </plugins>
