Skip to content

Commit

Permalink
Add .editorconfig and .gitattributes (#3036)
Browse files Browse the repository at this point in the history
* Adding .editorconfig

* Add .gitattributes

* Reformat pom.client.xml

* Reformat keyvault/data-plane/pom.xml

* Reformat batch/data-plane/pom.xml
  • Loading branch information
conniey committed Mar 6, 2019
1 parent 12a7b99 commit b0558ba
Show file tree
Hide file tree
Showing 5 changed files with 891 additions and 822 deletions.
28 changes: 28 additions & 0 deletions .editorconfig
@@ -0,0 +1,28 @@
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
# editorconfig.org
root = true

[*]
indent_style = space
indent_size = 4

# From https://maven.apache.org/developers/conventions/code.html
[*.xml]
indent_style = space
indent_size = 2
continuation_indent_size = 4

# From https://maven.apache.org/developers/conventions/code.html
[*.java]
indent_style = space
indent_size = 4
continuation_indent_size = 4

[*.md]
trim_trailing_whitespace = false
indent_style = space
indent_size = 4

charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
29 changes: 29 additions & 0 deletions .gitattributes
@@ -0,0 +1,29 @@
# Handle line endings automatically for files detected as text
# and leave all files detected as binary untouched.
* text=auto

# These files are text and should be normalized (Convert crlf => lf)
*.css text
*.htm text
*.html text
*.java text
*.js text
*.json text
*.jsp text
*.jspf text
*.jspx text
*.properties text
*.sh text
*.txt text
*.xml text
*.yml text

# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.class binary
*.dll binary
*.ear binary
*.ico binary
*.jar binary
*.so binary
*.war binary
7 changes: 5 additions & 2 deletions batch/data-plane/pom.xml
Expand Up @@ -3,7 +3,8 @@
Licensed under the MIT License. See License.txt in the project root for
license information.
-->
<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">
<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>
<parent>
<groupId>com.azure</groupId>
Expand All @@ -28,7 +29,9 @@
</site>
</distributionManagement>

<scm><url>https://github.com/Azure/azure-sdk-for-java</url></scm>
<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
</scm>

<dependencies>
<dependency>
Expand Down
39 changes: 21 additions & 18 deletions keyvault/data-plane/pom.xml
Expand Up @@ -3,7 +3,8 @@
Licensed under the MIT License. See License.txt in the project root for
license information.
-->
<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">
<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>
<parent>
<groupId>com.azure</groupId>
Expand All @@ -28,7 +29,9 @@
</site>
</distributionManagement>

<scm><url>https://github.com/Azure/azure-sdk-for-java</url></scm>
<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
</scm>

<properties>
<azure-keyvault.version>1.2.0</azure-keyvault.version>
Expand Down Expand Up @@ -72,22 +75,22 @@

<build>

<plugins>

<!-- This plugin is used to compile the sources of your project. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>

</plugins>
<plugins>

<!-- This plugin is used to compile the sources of your project. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>

</plugins>

</build>

Expand Down

0 comments on commit b0558ba

Please sign in to comment.