Skip to content

Commit

Permalink
Squashed 'runtimes/' changes from 0bcf347..4736d63
Browse files Browse the repository at this point in the history
4736d63 Merge pull request #16 from jianghaolu/checkstyle
9b363b4 Making corresponding changes to gradle
122b780 Update travis to install build tools
62865c0 Move checkstyle to build-tools
eb8754b Add checkstyle to travis build
de698f7 Optional suppression file for maven scenario
55702f0 Merge commit 'bebdec5b1bbf8d0d2b6be78eb00cd2fc85646763' into checkstyle
9071c8d Add checkstyle rules
7282bf8 Merge pull request #14 from jianghaolu/ua
13575b4 Pull runtimes subtree

git-subtree-dir: runtimes
git-subtree-split: 4736d63
  • Loading branch information
jianghaolu committed Jun 6, 2016
1 parent 3a6f34e commit bc5d074
Showing 1 changed file with 27 additions and 13 deletions.
40 changes: 27 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
<testMode>playback</testMode>
</properties>

<developers>
Expand Down Expand Up @@ -143,6 +142,29 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<dependencies>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>autorest-build-tools</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.18</version>
</dependency>
</dependencies>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<propertyExpansion>samedir=build-tools/src/main/resources</propertyExpansion>
<suppressionsLocation>suppressions.xml</suppressionsLocation>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -172,12 +194,6 @@
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand All @@ -195,9 +211,6 @@
<include>**/*Tests.java</include>
<include>**/*TestCase.java</include>
</includes>
<environmentVariables>
<test.mode>${testMode}</test.mode>
</environmentVariables>
</configuration>
</plugin>
<plugin>
Expand All @@ -209,8 +222,9 @@
</pluginManagement>
</build>
<modules>
<module>./client-runtime</module>
<module>./azure-client-runtime</module>
<module>./azure-client-authentication</module>
<module>build-tools</module>
<module>client-runtime</module>
<module>azure-client-runtime</module>
<module>azure-client-authentication</module>
</modules>
</project>

0 comments on commit bc5d074

Please sign in to comment.