diff --git a/pom.xml b/pom.xml index a30ed79c..aad02e2f 100755 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 1.0.13 4.12 3.6 - 3.6.1 + 3.8.0 2.10.4 3.0.1 @@ -304,79 +304,74 @@ - + + + + + + + org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} + maven-jxr-plugin + 2.3 - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - true - target/site/apidocs/ - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc-plugin.version} - - true - true - true - org.slf4j.migrator:org.slf4j.migrator.* - - **/module-info.java - - - - - http://java.sun.com/j2se/1.5.0/docs/api - - - - - SLF4J packages - org.slf4j:org.slf4j.* - - - - SLF4J extensions - - org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent - - - - - Jakarta Commons Logging packages - org.apache.commons.* - - - - java.util.logging (JUL) to SLF4J bridge - org.slf4j.bridge - - - - Apache log4j - org.apache.log4j:org.apache.log4j.* - - - - - - + true + target/site/apidocs/ + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc-plugin.version} + + true + true + true + org.slf4j.migrator:org.slf4j.migrator.* + + **/module-info.java + + + + + http://java.sun.com/j2se/1.5.0/docs/api + + + + + SLF4J packages + org.slf4j:org.slf4j.* + + + + SLF4J extensions + + org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent + + + + + Jakarta Commons Logging packages + org.apache.commons.* + + + + java.util.logging (JUL) to SLF4J bridge + org.slf4j.bridge + + + + Apache log4j + org.apache.log4j:org.apache.log4j.* + + + + + - - + diff --git a/release.sh b/release.sh index 9b0c6186..a1180c09 100755 --- a/release.sh +++ b/release.sh @@ -29,12 +29,18 @@ echoRunAndCheck "$MVN clean" echoRunAndCheck "$MVN install" -echoRunAndCheck "$MVN site:site" +#echoRunAndCheck "$MVN site:site" +echoRunAndCheck "$MVN javadoc:aggregate" + +echoRunAndCheck "$MVN jxr:aggregate" echoRunAndCheck "$MVN assembly:single" -echoRunAndCheck "$MVN deploy -P javadocjar,sign-artifacts -Dgpg.passphrase=$PASS" +if [ ! -z "$PASS" ] +then + echoRunAndCheck "$MVN deploy -P javadocjar,sign-artifacts -Dgpg.passphrase=$PASS" +fi #$MVN site:deploy -N # with Java 8!!! #checkExit "mvn site:deploy -N" @@ -43,3 +49,5 @@ echoRunAndCheck "$MVN deploy -P javadocjar,sign-artifacts -Dgpg.passphrase=$PASS #git push --tags #release version and add next version on jira + +echo Full Success