You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/11/22 16:54:54 UTC
[jspwiki-site] branch jbake updated (320f476 -> 20ceca6)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git.
from 320f476 2.11.0
new 120fb7f update .gitignore
new 101c0d2 fix artifact names
new 20ceca6 Allow Jenkinsfile to generate apidocs & japicmp reports for specific tags - build is now parameterized
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 6 +++++-
Jenkinsfile | 70 +++++++++++++++++++++++++++++++++++++++++++++----------------
pom.xml | 16 +++++++-------
3 files changed, 65 insertions(+), 27 deletions(-)
[jspwiki-site] 02/03: fix artifact names
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit 101c0d2f62fff21fe516ae54e0d694a33e959ece
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Nov 22 17:41:02 2021 +0100
fix artifact names
---
pom.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26e7235..9e2ea35 100755
--- a/pom.xml
+++ b/pom.xml
@@ -299,17 +299,17 @@
</configuration>
</execution>
<execution>
- <id>cmp-jspwiki-kendra-search-provider</id>
+ <id>cmp-jspwiki-kendra-searchprovider</id>
<phase>generate-resources</phase>
<goals><goal>cmp</goal></goals>
<configuration>
<parameter>
- <htmlTitle>Binary compatibility between jspwiki-kendra-search-provider ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle>
+ <htmlTitle>Binary compatibility between jspwiki-kendra-searchprovider ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle>
</parameter>
<oldVersion>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jspwiki-kendra-search-provider</artifactId>
+ <artifactId>jspwiki-kendra-searchprovider</artifactId>
<version>${plugin.japicmp.jspwiki-old}</version>
<type>jar</type>
</dependency>
@@ -317,7 +317,7 @@
<newVersion>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jspwiki-kendra-search-provider</artifactId>
+ <artifactId>jspwiki-kendra-searchprovider</artifactId>
<version>${plugin.japicmp.jspwiki-new}</version>
<type>jar</type>
</dependency>
@@ -378,17 +378,17 @@
</configuration>
</execution>
<execution>
- <id>cmp-jspwiki-tika-search-provider</id>
+ <id>cmp-jspwiki-tika-searchprovider</id>
<phase>generate-resources</phase>
<goals><goal>cmp</goal></goals>
<configuration>
<parameter>
- <htmlTitle>Binary compatibility between jspwiki-tika-search-provider ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle>
+ <htmlTitle>Binary compatibility between jspwiki-tika-searchprovider ${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}</htmlTitle>
</parameter>
<oldVersion>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jspwiki-tika-search-provider</artifactId>
+ <artifactId>jspwiki-tika-searchprovider</artifactId>
<version>${plugin.japicmp.jspwiki-old}</version>
<type>jar</type>
</dependency>
@@ -396,7 +396,7 @@
<newVersion>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jspwiki-tika-search-provider</artifactId>
+ <artifactId>jspwiki-tika-searchprovider</artifactId>
<version>${plugin.japicmp.jspwiki-new}</version>
<type>jar</type>
</dependency>
[jspwiki-site] 03/03: Allow Jenkinsfile to generate apidocs & japicmp reports for specific tags - build is now parameterized
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit 20ceca6f3d6aacbd06b17c7b2b7521b3565a2b2e
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Nov 22 17:52:51 2021 +0100
Allow Jenkinsfile to generate apidocs & japicmp reports for specific tags - build is now parameterized
---
Jenkinsfile | 70 +++++++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 52 insertions(+), 18 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4da111c..a472d1d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,36 +17,65 @@
* under the License.
*/
+repo = 'https://gitbox.apache.org/repos/asf/jspwiki-site.git'
+buildRepo = 'https://github.com/apache/jspwiki'
+creds = '9b041bd0-aea9-4498-a576-9eeb771411dd'
+asfsite = 'asf-site'
+build = 'build'
+jbake = 'jbake'
+errMsg = ''
+
try {
- def repo = 'https://gitbox.apache.org/repos/asf/jspwiki-site.git'
- def creds = '9b041bd0-aea9-4498-a576-9eeb771411dd'
- def asfsite = 'asf-site'
- def jbake = 'jbake'
node( 'ubuntu' ) {
def JAVA_JDK_8=tool name: 'jdk_1.8_latest', type: 'hudson.model.JDK'
- echo "Will use Java $JAVA_JDK_8"
-
+ def JAVA_JDK_11=tool name: 'jdk_11_latest', type: 'hudson.model.JDK'
def MAVEN_3_LATEST=tool name: 'maven_3_latest', type: 'hudson.tasks.Maven$MavenInstallation'
- echo "Will use Maven $MAVEN_3_LATEST"
-
- stage( "clone $jbake branch" ) {
+ def version = params?.version ?: 'master'
+ def pom
+
+ stage( 'clean workspace' ) {
cleanWs()
- dir( jbake ) {
- git branch: jbake, url: repo, credentialsId: creds, poll: true
+ }
+
+ stage( 'generate apidocs & translations' ) {
+ echo "Will use Java $JAVA_JDK_11"
+ echo "Will use Maven $MAVEN_3_LATEST"
+ def gitVersion = version != 'master' ? "refs/tags/$version" : ''
+
+ dir( build ) {
+ checkout( [
+ scm: [
+ $class: 'GitSCM',
+ branches: [[ name: gitVersion ]],
+ extensions: [[$class: 'CloneOption', shallow: false, depth: 0, reference: '' ]],
+ userRemoteConfigs: [[url: buildRepo ]]
+ ]
+ ] )
+ pom = readMavenPom file: 'pom.xml'
+ writeFile file: 'target/classes/apidocs.txt', text: 'file created in order to allow aggregated javadoc generation, target/classes is needed for all modules'
+ writeFile file: 'jspwiki-it-tests/target/classes/apidocs.txt', text: 'file created in order to allow aggregated javadoc generation, target/classes is needed for all modules'
+ withEnv( [ "Path+JDK=$JAVA_JDK_11/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
+ sh 'mvn package javadoc:aggregate-no-fork -DskipTests -pl !jspwiki-portable -Djdk.javadoc.doclet.version=2.0.15'
+ sh 'java -cp jspwiki-main/target/classes org.apache.wiki.TranslationsCheck site'
+ }
}
}
stage( 'build website' ) {
+ echo "Will use Java $JAVA_JDK_8"
+ echo "Will use Maven $MAVEN_3_LATEST"
withEnv( [ "Path+JDK=$JAVA_JDK_8/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
+ def jbakeVersion = version != 'master' ? " -Dplugin.japicmp.jspwiki-new=$version" : pom.version
dir( jbake ) {
- sh 'mvn clean process-resources'
+ git branch: jbake, url: repo, credentialsId: creds, poll: true
+ sh 'mvn clean process-resources $jbakeVersion'
}
stash name: 'jbake-website'
}
}
-
- }
+
+ }
node( 'git-websites' ) {
stage( 'publish website' ) {
@@ -55,6 +84,10 @@ try {
dir( asfsite ) {
git branch: asfsite, url: repo, credentialsId: creds
sh "cp -rf ../$jbake/target/content/* ./"
+ if( version != 'master' ) {
+ def apidocsVersion = version != 'master' ? version : pom.version
+ sh "mkdir -p ./apidocs/$apidocsVersion && cp -rf ../$build/target/site/apidocs/* ./apidocs/$apidocsVersion"
+ }
timeout( 15 ) { // 15 minutes
sh 'git add .'
sh 'git commit -m "Automatic Site Publish by Buildbot"'
@@ -64,19 +97,20 @@ try {
}
}
}
-
+
currentBuild.result = 'SUCCESS'
-
+
} catch( Exception err ) {
currentBuild.result = 'FAILURE'
echo err.message
+ errMsg = '- ' + err.message
} finally {
node( 'ubuntu' ) {
if( currentBuild.result == null ) {
currentBuild.result = 'ABORTED'
}
- emailext body: "See ${env.BUILD_URL}",
- replyTo: 'dev@jspwiki.apache.org',
+ emailext body: "See ${env.BUILD_URL} $errMsg",
+ replyTo: 'dev@jspwiki.apache.org',
to: 'commits@jspwiki.apache.org',
subject: "[${env.JOB_NAME}] build ${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}"
}
[jspwiki-site] 01/03: update .gitignore
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit 120fb7f9e6bc9a45025d15d2490bc8dd33cc8e40
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Nov 22 17:40:50 2021 +0100
update .gitignore
---
.gitignore | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index ede224c..001b31b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,8 @@ target
.settings
.classpath
.project
-nb-configuration.xml
\ No newline at end of file
+nb-configuration.xml
+**/*.iml
+.idea
+.metadata
+.checkstyle
\ No newline at end of file