diff --git a/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/ExtensionsIndexGenerationMojo.java b/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/ExtensionsIndexGenerationMojo.java index 4d5f2f8aeb..1c060bb507 100644 --- a/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/ExtensionsIndexGenerationMojo.java +++ b/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/ExtensionsIndexGenerationMojo.java @@ -74,7 +74,8 @@ public class ExtensionsIndexGenerationMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { // Finding the root maven project MavenProject rootMavenProject = mavenProject; - while (rootMavenProject.getParent().getBasedir() != null) { + while (rootMavenProject.getParent() != null && + rootMavenProject.getParent().getBasedir() != null) { rootMavenProject = rootMavenProject.getParent(); } diff --git a/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/MarkdownDocumentationGenerationMojo.java b/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/MarkdownDocumentationGenerationMojo.java index 381bb3d946..bde470828b 100644 --- a/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/MarkdownDocumentationGenerationMojo.java +++ b/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/MarkdownDocumentationGenerationMojo.java @@ -95,7 +95,8 @@ public class MarkdownDocumentationGenerationMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { // Finding the root maven project MavenProject rootMavenProject = mavenProject; - while (rootMavenProject.getParent().getBasedir() != null) { + while (rootMavenProject.getParent() != null && + rootMavenProject.getParent().getBasedir() != null) { rootMavenProject = rootMavenProject.getParent(); } diff --git a/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/MkdocsGitHubPagesDeployMojo.java b/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/MkdocsGitHubPagesDeployMojo.java index b6cd157d68..3f702fcf8d 100644 --- a/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/MkdocsGitHubPagesDeployMojo.java +++ b/modules/siddhi-doc-gen/src/main/java/org/wso2/siddhi/doc/gen/core/MkdocsGitHubPagesDeployMojo.java @@ -97,7 +97,8 @@ public class MkdocsGitHubPagesDeployMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { // Finding the root maven project MavenProject rootMavenProject = mavenProject; - while (rootMavenProject.getParent().getBasedir() != null) { + while (rootMavenProject.getParent() != null && + rootMavenProject.getParent().getBasedir() != null) { rootMavenProject = rootMavenProject.getParent(); } diff --git a/pom.xml b/pom.xml index 3a885b54f4..f3fc9cc64b 100644 --- a/pom.xml +++ b/pom.xml @@ -17,15 +17,10 @@ ~ under the License. --> - - 4.0.0 - - - org.wso2 - wso2 - 5 - + + 4.0.0 io.siddhi siddhi pom @@ -33,6 +28,13 @@ Siddhi Siddhi, high performing Complex Event Processing Engine + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + modules/siddhi-query-api modules/siddhi-service @@ -230,7 +232,7 @@ org.apache.maven.wagon wagon-ssh - 2.1 + ${maven.wagon.ssh.version} @@ -239,10 +241,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + ${maven.compiler.plugin.version} - 1.8 - 1.8 + ${wso2.maven.compiler.source} + ${wso2.maven.compiler.target} @@ -250,7 +252,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.4.3 + ${maven.surefire.plugin.version} ${project.build.testSourceDirectory} ${project.build.testOutputDirectory} @@ -288,22 +290,10 @@ - org.apache.maven.plugins maven-javadoc-plugin + ${maven.javadoc.plugin.version} docs @@ -324,11 +314,6 @@ scala-maven-plugin 3.1.6 - - org.apache.felix - maven-bundle-plugin - 3.2.0 - org.antlr antlr4-maven-plugin @@ -337,52 +322,180 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + ${maven.dependency.plugin.version} org.apache.maven.plugins maven-release-plugin + ${maven.release.plugin.version} clean install -Pdocumentation-deploy true + + + + io.siddhi + siddhi-doc-gen + ${project.version} + + + org.codehaus.mojo + buildnumber-maven-plugin + ${maven.buildnumber.plugin.version} + + + org.codehaus.mojo + clirr-maven-plugin + ${clirr.maven.plugin.version} + + + org.codehaus.mojo + findbugs-maven-plugin + ${maven.findbugsplugin.version} + + Max + Low + true + ${project.build.directory}/findbugs + + ${mavan.findbugsplugin.exclude.file} + + + + analyze-compile + compile + + check + + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + ${maven.remote.resources.plugin.version} + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.plugin.version} + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven.plugin.plugin.version} + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven.antrun.plugin.version} + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven.assembly.plugin.version} + + + org.apache.maven.plugins + maven-clean-plugin + ${maven.clean.plugin.version} + org.apache.maven.plugins maven-deploy-plugin + ${maven.deploy.plugin.version} - io.siddhi - siddhi-doc-gen - ${project.version} + org.apache.maven.plugins + maven-docck-plugin + ${maven.docck.plugin.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven.failsafe.plugin.version} + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin.version} + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven.invoker.plugin.version} + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + + true + true + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven.resources.plugin.version} + + + org.apache.maven.plugins + maven-scm-plugin + ${maven.scm.plugin.version} + + + org.apache.maven.plugins + maven-scm-publish-plugin + ${maven.scm.publish.plugin.version} + + + + org.apache.maven.plugins + maven-site-plugin + ${maven.site.plugin.version} + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.plugin.version} + + + org.apache.rat + apache-rat-plugin + ${apache.rat.plugin.version} + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven.plugin.plugin.version} - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - org.apache.maven.plugins maven-shade-plugin ${maven.shadeplugin.version} - org.codehaus.mojo findbugs-maven-plugin @@ -405,9 +518,27 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${wso2.maven.compiler.source} + ${wso2.maven.compiler.target} + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + org.apache.maven.plugins maven-checkstyle-plugin + ${maven.checkstyleplugin.version} validate @@ -432,10 +563,170 @@ - - + + + org.apache.maven.plugins + maven-remote-resources-plugin + ${maven.remote.resources.plugin.version} + + + + process + + + + org.apache:apache-jar-resource-bundle:1.4 + + + + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.plugin.version} + ${maven.bundle.plugin.extensions} + + NONE + + ${bundle.activator} + ${bundle.activation.policy} + ${bundle.classpath} + ${bundle.contributors} + WSO2 Inc + ${project.description} + ${bundle.developers} + ${bundle.docurl} + http://www.apache.org/licenses/LICENSE-2.0.txt + ${bundle.name} + ${project.artifactId} + WSO2 Inc + ${conditional.package} + ${dynamic.import.package} + ${export.package} + ${fragment.host} + ${import.package} + ${meta.persistence} + ${private.package} + ${provide.capability} + ${require.bundle} + ${require.capability} + ${service.component} + ${microservices} + <_dsannotations>${dsannotations} + ${startup.component} + ${carbon.component} + <_include>${_include} + ${buildNumber} + + + + + org.codehaus.mojo + buildnumber-maven-plugin + ${maven.buildnumber.plugin.version} + + + validate + + create + + + + + false + false + ${maven.build.timestamp} + + + + + + wso2-release + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + org.apache.apache.resources + apache-source-release-assembly-descriptor + ${apache.source.release.assembly.descriptor.version} + + + + + source-release-assembly + package + + single + + + true + + ${sourceReleaseAssemblyDescriptor} + + gnu + + + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + sign + + + + + + + + + 6.8 1.2.17.wso2v1 @@ -468,6 +759,55 @@ 0.7.9 findbugs-exclude.xml checkstyle-suppressions.xml + 1.0.5 + 1.5 + 1.4 + 2.7 + + 1.8 + 2.6 + 3.0.0 + 2.8.2 + 1.1 + 1.4.1 + 2.19.1 + 1.6 + 2.5.2 + 2.0.0 + 2.6 + 2.7 + 1.9.4 + 1.1 + 3.5 + 3.0.0 + 0.11 + + 3.4 + 2.17 + 2.19.1 + 3.0.3 + 3.5.1 + 1.8 + 1.8 + source-release + my-scm-server + + + 3.2.0 + WSO2 Inc + true + . + * + WSO2 Inc + WSO2 Inc + https://docs.wso2.com + ${project.artifactId} + * + + 2.10 + 2.10.3 + 2.5.3 + 2.10 @@ -488,7 +828,6 @@ ignore - wso2.releases WSO2 internal Repository @@ -499,7 +838,6 @@ ignore - wso2.snapshots Apache Snapshot Repository @@ -512,7 +850,6 @@ false - central Maven Repository Switchboard @@ -522,7 +859,6 @@ false - sonatype.releases @@ -532,7 +868,6 @@ - wso2.releases WSO2 internal Repository @@ -543,7 +878,6 @@ ignore - wso2.snapshots Apache Snapshot Repository @@ -556,7 +890,6 @@ false - wso2-nexus WSO2 internal Repository @@ -567,7 +900,19 @@ ignore - + + + nexus-releases + WSO2 Nexus Release Repository + http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/ + + + wso2.snapshots + WSO2 Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + +