diff --git a/dependency-check-gradle/src/site/site.xml b/dependency-check-gradle/src/site/site.xml
deleted file mode 100644
index 98859a96c..000000000
--- a/dependency-check-gradle/src/site/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- OWASP dependency-check-gradle
- OWASP dependency-check-gradle
- ./images/dc-gradle.svg
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dependency-check-jenkins/README.md b/dependency-check-jenkins/README.md
deleted file mode 100644
index 5e5e0b64b..000000000
--- a/dependency-check-jenkins/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Dependency-Check Jenkins Plugin
-==============================
-
-Dependency-Check is a utility that identifies project dependencies and checks if there are any known, publicly disclosed, vulnerabilities. This tool can be part of the solution to the OWASP Top 10 2013: A9 - Using Components with Known Vulnerabilities. This plug-in can independently execute a Dependency-Check analysis and visualize results.
-
-The Dependency-Check Jenkins Plugin features the ability to perform a dependency analysis build and later view results post build. The plugin is built using [analysis-core] and features many of the same features that Jenkins static analysis plugins offer, including thresholds, charts and the ability to view vulnerability information should a dependency have one identified.
-
-More information can be found on the [wiki].
-
-Mailing List
-------------
-
-Subscribe: [dependency-check+subscribe@googlegroups.com] [subscribe]
-
-Post: [dependency-check@googlegroups.com] [post]
-
-Copyright & License
--------------------
-
-Dependency-Check is Copyright (c) 2012-2014 Jeremy Long. All Rights Reserved.
-
-Dependency-Check Jenkins Plugin is Copyright (c) 2013-2014 Steve Springett. All Rights Reserved.
-
-Permission to modify and redistribute is granted under the terms of the Apache 2.0 license. See the [LICENSE.txt] [license] file for the full license.
-
-Dependency-Check makes use of several other open source libraries. Please see the [NOTICE.txt] [notices] file for more information.
-
-
- [wiki]: https://wiki.jenkins-ci.org/display/JENKINS/OWASP+Dependency-Check+Plugin
- [analysis-core]: http://wiki.jenkins-ci.org/x/CwDgAQ
- [subscribe]: mailto:dependency-check+subscribe@googlegroups.com
- [post]: mailto:dependency-check@googlegroups.com
- [license]: https://github.com/jenkinsci/dependency-check-plugin/blob/master/LICENSE.txt
- [notices]: https://github.com/jenkinsci/dependency-check-plugin/blob/master/NOTICES.txt
diff --git a/dependency-check-jenkins/pom.xml b/dependency-check-jenkins/pom.xml
deleted file mode 100644
index 81f1aba65..000000000
--- a/dependency-check-jenkins/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
- 4.0.0
-
- org.owasp
- dependency-check-parent
- 1.3.2-SNAPSHOT
-
- dependency-check-jenkins
- Dependency-Check Jenkins Plugin
- http://wiki.jenkins-ci.org/display/JENKINS/OWASP+Dependency-Check+Plugin
- dependency-check-jenkins is a Jenkins plugin that runs dependency-check-core on a project to detect publicly disclosed vulnerabilities associated with the project's dependencies. The plugin will generate a report listing the dependency, any identified Common Platform Enumeration (CPE) identifiers, and the associated Common Vulnerability and Exposure (CVE) entries. This module is simply a placeholder and does not contain the actual plugin source code. The source code and distribution of the plugin is handled via https://github.com/jenkinsci/dependency-check-jenkins and Jenkin's plugin management.
-
-
-
- github-pages-site
- Deployment through GitHub's site deployment plugin
- ${basedir}/../target/site/${project.version}/dependency-check-jenkins
-
-
-
-
-
-
- true
-
- true
-
-
- pom
- 2012
-
- OWASP
- http://www.owasp.org
-
-
-
-
- Steve Springett
- steve.springett@owasp.org
- OWASP
- https://www.owasp.org/index.php/OWASP_Dependency_Check
-
- architect
- developer
-
-
-
-
- scm:git:git@github.com:jenkinsci/dependency-check-jenkins.git
- https://github.com/jenkinsci/dependency-check-jenkins
- scm:git:git@github.com:jenkinsci/dependency-check-jenkins.git
-
-
- github
- https://github.com/jenkinsci/dependency-check-jenkins/issues
-
-
-
-
- org.apache.maven.plugins
- maven-site-plugin
-
-
- org.apache.maven.doxia
- doxia-module-markdown
- 1.6
-
-
-
- true
-
-
-
-
-
diff --git a/dependency-check-jenkins/src/site/site.xml b/dependency-check-jenkins/src/site/site.xml
deleted file mode 100644
index 49a8f201c..000000000
--- a/dependency-check-jenkins/src/site/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- OWASP dependency-check-jenkins
- OWASP dependency-check-maven
- ./images/dc-jenkins.svg
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9d8a82e56..eb0f20f1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,6 @@ Copyright (c) 2012 - Jeremy Long
dependency-check-cli
dependency-check-ant
dependency-check-maven
- dependency-check-gradle
- dependency-check-jenkins
dependency-check-utils
Dependency-Check
@@ -134,6 +132,14 @@ Copyright (c) 2012 - Jeremy Long
3.5
+
+ ossrh
+ https://oss.sonatype.org/content/repositories/snapshots
+
+
+ ossrh
+ https://oss.sonatype.org/service/local/staging/deploy/maven2/
+
gh-pages
gh-pages
@@ -231,13 +237,19 @@ Copyright (c) 2012 - Jeremy Long
maven-antrun-plugin
1.8
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 2.2.1
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.9.1
+
-
- org.apache.maven.plugins
- maven-release-plugin
-
org.apache.maven.plugins
maven-compiler-plugin
@@ -248,6 +260,20 @@ Copyright (c) 2012 - Jeremy Long
1.6
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+ true
+
+
+
+ **/checkstyle*
+
+
+
org.apache.maven.plugins
maven-failsafe-plugin
@@ -273,16 +299,9 @@ Copyright (c) 2012 - Jeremy Long
org.apache.maven.plugins
- maven-jar-plugin
+ maven-release-plugin
-
-
- true
-
-
-
- **/checkstyle*
-
+ release
@@ -323,7 +342,6 @@ Copyright (c) 2012 - Jeremy Long
true
-
false
org.apache.maven.plugins
@@ -346,6 +364,55 @@ Copyright (c) 2012 - Jeremy Long
+
+
+ release
+
+ false
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+
+
+
@@ -359,7 +426,7 @@ Copyright (c) 2012 - Jeremy Long
2.10.3
false
- Copyright© 2012-15 Jeremy Long. All Rights Reserved.
+ Copyright© 2012-15 Jeremy Long. All Rights Reserved.
diff --git a/dependency-check-gradle/src/site/markdown/configuration-update.md b/src/site/markdown/dependency-check-gradle/configuration-update.md
similarity index 100%
rename from dependency-check-gradle/src/site/markdown/configuration-update.md
rename to src/site/markdown/dependency-check-gradle/configuration-update.md
diff --git a/dependency-check-gradle/src/site/markdown/configuration.md b/src/site/markdown/dependency-check-gradle/configuration.md
similarity index 100%
rename from dependency-check-gradle/src/site/markdown/configuration.md
rename to src/site/markdown/dependency-check-gradle/configuration.md
diff --git a/dependency-check-gradle/src/site/markdown/index.md.vm b/src/site/markdown/dependency-check-gradle/index.md.vm
similarity index 100%
rename from dependency-check-gradle/src/site/markdown/index.md.vm
rename to src/site/markdown/dependency-check-gradle/index.md.vm
diff --git a/dependency-check-jenkins/src/site/markdown/index.md b/src/site/markdown/dependency-check-jenkins/index.md
similarity index 100%
rename from dependency-check-jenkins/src/site/markdown/index.md
rename to src/site/markdown/dependency-check-jenkins/index.md
diff --git a/dependency-check-gradle/src/site/resources/images/dc-gradle.svg b/src/site/resources/images/dc-gradle.svg
similarity index 100%
rename from dependency-check-gradle/src/site/resources/images/dc-gradle.svg
rename to src/site/resources/images/dc-gradle.svg
diff --git a/dependency-check-jenkins/src/site/resources/images/dc-jenkins.svg b/src/site/resources/images/dc-jenkins.svg
similarity index 100%
rename from dependency-check-jenkins/src/site/resources/images/dc-jenkins.svg
rename to src/site/resources/images/dc-jenkins.svg