Merge pull request #125 from Reamer/master

Begin work with release process
dependency-check · Apr 7, 2019 · ebe7e68 · ebe7e68
2 parents d3ff37f + ddf6926
commit ebe7e68
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,8 +60,9 @@
     <!-- todo: remove this when SonarSource Forge hosting becomes a reality -->
     <distributionManagement>
         <repository>
-            <id>bintray</id>
-            <url>https://api.bintray.com/maven/SonarSecurityCommunity/owasp/dependency-check-sonar</url>
+            <id>bintray-sonarsecuritycommunity-owasp</id>
+            <name>sonarsecuritycommunity-owasp</name>
+            <url>https://api.bintray.com/maven/sonarsecuritycommunity/owasp/sonar-dependency-check/</url>
         </repository>
     </distributionManagement>
 
@@ -87,31 +88,39 @@
             </plugin>
             <plugin>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>${version.release.plugin}</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>
                     <releaseProfiles>release</releaseProfiles>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>de.jutzig</groupId>
-                <artifactId>github-release-plugin</artifactId>
-                <version>1.2.0</version>
-                <configuration>
-                    <releaseName>sonar-dependency-check-${project.version}</releaseName>
-                    <tag>${project.version}</tag>
-                    <fileSets>
-                        <fileSet>
-                            <directory>sonar-dependency-check-plugin/target</directory>
-                            <includes>
-                                <include>sonar-dependency-check-plugin-${project.version}.jar</include>
-                            </includes>
-                        </fileSet>
-                    </fileSets>
-                </configuration>
-            </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>de.jutzig</groupId>
+                    <artifactId>github-release-plugin</artifactId>
+                    <version>1.3.0</version>
+                    <configuration></configuration>
+                    <executions>
+                        <execution>
+                            <id>github</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>release</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
-
+    <profiles>
+        <profile>
+            <id>skip-bintray</id>
+            <properties>
+                <maven.deploy.skip>true</maven.deploy.skip>
+            </properties>
+        </profile>
+    </profiles>
 </project>
diff --git a/sonar-dependency-check-plugin/pom.xml b/sonar-dependency-check-plugin/pom.xml
@@ -12,6 +12,13 @@
     <name>Dependency-Check Plugin for SonarQube</name>
     <url>https://www.owasp.org/index.php/OWASP_Dependency_Check</url>
 
+    <scm>
+      <connection>scm:git:https://github.com/SonarSecurityCommunity/dependency-check-sonar-plugin</connection>
+      <developerConnection>scm:git:https://github.com/SonarSecurityCommunity/dependency-check-sonar-plugin</developerConnection>
+      <url>https://github.com/SonarSecurityCommunity/dependency-check-sonar-plugin</url>
+      <tag>HEAD</tag>
+    </scm>
+
     <properties>
         <sonar.version>7.6</sonar.version>
         <!-- Configuration for sonar-packaging-maven-plugin -->
@@ -57,5 +64,26 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    <build>
+       <plugins>
+            <plugin>
+                <groupId>de.jutzig</groupId>
+                <artifactId>github-release-plugin</artifactId>
+                <configuration>
+                    <releaseName>sonar-dependency-check-${project.version}</releaseName>
+                    <description>Integrates Dependency-Check reports into SonarQube ${sonar.version} and above.</description>
+                    <tag>${project.version}</tag>
+                    <deleteRelease>true</deleteRelease>
+                    <fileSets>
+                        <fileSet>
+                            <directory>${project.build.directory}</directory>
+                            <includes>
+                                <include>sonar-dependency-check-plugin-${project.version}.jar</include>
+                            </includes>
+                        </fileSet>
+                    </fileSets>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>