Combine repo locations, and update gitignore and gitattributes

flowpowered · Jan 26, 2014 · fb1e777 · fb1e777
1 parent 5504b5c
commit fb1e777
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,11 +5,12 @@
 # Binary files that should not be modified
 *.dat binary
 *.db binary
+*.gif binary
 *.icns binary
 *.ico binary
-*.key binary
 *.jks binary
 *.jpg binary
+*.key binary
 *.png binary
 *.ttf binary
 *.wav binary

diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ build
 dist
 lib
 out
+run
 target
 *.com
 *.class
@@ -28,10 +29,13 @@ target
 ############
 *.7z
 *.dmg
+*.ear
 *.gz
 *.iso
+*.jar
 *.rar
 *.tar
+*.war
 *.zip
 
 # Repository #
@@ -46,6 +50,7 @@ target
 # Misc #
 ########
 *.bak
+*.tmp
 
 # System #
 ##########
@@ -55,7 +60,9 @@ Thumbs.db
 
 # Project #
 ###########
+.buildpath
 .classpath
+.cproject
 .externalToolBuilders
 .gradle
 .idea
@@ -68,3 +75,6 @@ nb-configuration.xml
 *.iml
 *.ipr
 *.iws
+*.launch
+*.pydevproject
+
diff --git a/pom.xml b/pom.xml
@@ -82,12 +82,8 @@
     <!-- Dependency repositories -->
     <repositories>
         <repository>
-            <id>sonatype-nexus-releases</id>
-            <url>https://oss.sonatype.org/content/repositories/releases</url>
-        </repository>
-        <repository>
-            <id>sonatype-nexus-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <id>sonatype-nexus</id>
+            <url>https://oss.sonatype.org/content/repositories/public</url>
             <snapshots>
                 <enabled>true</enabled>
                 <updatePolicy>always</updatePolicy>
@@ -98,12 +94,8 @@
     <!-- Build plugin repositories -->
     <pluginRepositories>
         <pluginRepository>
-            <id>sonatype-nexus-releases</id>
-            <url>https://oss.sonatype.org/content/repositories/releases</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <id>sonatype-nexus</id>
+            <url>https://oss.sonatype.org/content/repositories/public</url>
             <snapshots>
                 <enabled>true</enabled>
                 <updatePolicy>always</updatePolicy>