Merge branch 'improvement/ghi-#4-add-bintray-deployment-support' into…

… develop
nordtheme · Sep 28, 2016 · f74c7a5 · f74c7a5
2 parents 1a02e6d + 1f93f69
commit f74c7a5
Showing 1 changed file with 41 additions and 29 deletions.
diff --git a/pom.xml b/pom.xml
@@ -104,22 +104,6 @@ JFrog Bintray
     <url>https://github.com/arcticicestudio/nord-java/issues</url>
   </issueManagement>
 
-  <distributionManagement>
-    <downloadUrl>https://github.com/arcticicestudio/nord-java</downloadUrl>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <name>OSS Sonatype</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <layout>default</layout>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <name>OSS Sonatype</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-      <layout>default</layout>
-    </repository>
-  </distributionManagement>
-
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -273,18 +257,6 @@ JFrog Bintray
           <createChecksum>true</createChecksum>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ossrh</serverId>
-          <nexusUrl>https://oss.sonatype.org</nexusUrl>
-          <autoReleaseAfterClose>false</autoReleaseAfterClose>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
@@ -381,14 +353,54 @@ JFrog Bintray
     </profile>
 
     <profile>
-      <id>bintray-deploy</id>
+      <id>bintray</id>
       <distributionManagement>
+        <downloadUrl>https://github.com/arcticicestudio/nord-java</downloadUrl>
+          <snapshotRepository>
+            <id>bintray</id>
+            <name>OSS JFrog</name>
+            <url>http://oss.jfrog.org/artifactory/oss-snapshot-local</url>
+          </snapshotRepository>
         <repository>
            <id>bintray</id>
            <name>JFrog Bintray</name>
            <url>https://api.bintray.com/maven/arcticicestudio/Nord/nord-java/;publish=1</url>
         </repository>
       </distributionManagement>
     </profile>
+
+    <profile>
+      <id>oss-sonatype</id>
+      <distributionManagement>
+        <downloadUrl>https://github.com/arcticicestudio/nord-java</downloadUrl>
+        <snapshotRepository>
+          <id>ossrh</id>
+          <name>OSS Sonatype</name>
+          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <layout>default</layout>
+        </snapshotRepository>
+        <repository>
+          <id>ossrh</id>
+          <name>OSS Sonatype</name>
+          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+          <layout>default</layout>
+        </repository>
+      </distributionManagement>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.7</version>
+            <extensions>true</extensions>
+            <configuration>
+              <serverId>ossrh</serverId>
+              <nexusUrl>https://oss.sonatype.org</nexusUrl>
+              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>