This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch feature/changed-directory-structure in repository https://gitbox.apache.org/repos/asf/incubator-training.git
commit 6ba22c8c3cca3d83e9d0f19c5adb59cb910d7765 Author: Christofer Dutz <[email protected]> AuthorDate: Fri Apr 26 11:16:15 2019 +0200 - Added maven pom files to help IDEs with the new directory structure - Added Jenkinsfiles to allow building of sub-modules --- Jenkinsfile | 45 +++++++++++++++++++++++++++++++++++++++++++++ NOTICE | 8 +++++++- pom.xml | 38 ++++++++++++++++++++++++++++++++++++++ site/Jenkinsfile | 23 +++-------------------- site/pom.xml | 2 +- tools/Jenkinsfile | 37 +++++++++++++++++++++++++++++++++++++ tools/pom.xml | 36 ++++++++++++++++++++++++++++++++++++ 7 files changed, 167 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..2d04f07 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,45 @@ +#!groovy + +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +pipeline { + agent any + options { + timestamps() + } + stages { + stage('Build Website') { + when { + changeset "site/**" + } + steps { + build 'site' + } + } + stage('Build Tools') { + when { + changeset "tools/**" + } + steps { + build 'tools' + } + } + } +} \ No newline at end of file diff --git a/NOTICE b/NOTICE index 6529759..ea2389d 100644 --- a/NOTICE +++ b/NOTICE @@ -2,4 +2,10 @@ Apache Training (incubating) Copyright 2019 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file +The Apache Software Foundation (http://www.apache.org/). + +---------------------------------------------- + +This product includes a modified version of a file: +tools/maven-revealjs-asciidoctor-templte/libs/docinfo-hack/document.html.slim +developed at https://github.com/asciidoctor/asciidoctor-reveal.js diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..52daa21 --- /dev/null +++ b/pom.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/POM/4.0.0"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.training</groupId> + <artifactId>training</artifactId> + <version>0.4.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Training Parent</name> + <description>This is just a proxy pom to tell maven-aware about the other parts of the project.</description> + + <modules> + <module>site</module> + <module>tools</module> + </modules> + +</project> diff --git a/site/Jenkinsfile b/site/Jenkinsfile index d1b3344..c90d695 100644 --- a/site/Jenkinsfile +++ b/site/Jenkinsfile @@ -107,7 +107,7 @@ pipeline { script { if(env.BRANCH_NAME == "develop") { emailext( - subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", + subject: "[Website][BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ BUILD-FAILURE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]': @@ -124,7 +124,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC script { if(env.BRANCH_NAME == "develop") { emailext( - subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", + subject: "[Website][BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ BUILD-UNSTABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]': @@ -144,7 +144,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC script { if ((env.BRANCH_NAME == "develop") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { emailext ( - subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", + subject: "[Website][BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ BUILD-STABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]': @@ -155,23 +155,6 @@ Is back to normal. } } } - - // This block might become interesting if development is done on a branch other than master. - /*always { - script { - if(env.BRANCH_NAME == "master") { - emailext( - subject: "[COMMIT-TO-MASTER]: A commit to the master branch was made'", - body: """ -COMMIT-TO-MASTER: A commit to the master branch was made: - -Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>" -""", - to: "[email protected]" - ) - } - } - }*/ } } \ No newline at end of file diff --git a/site/pom.xml b/site/pom.xml index 3bc5b4e..c63d216 100644 --- a/site/pom.xml +++ b/site/pom.xml @@ -33,7 +33,7 @@ <version>0.4.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Training</name> + <name>Training: Website</name> <description> Write something sensible here ... </description> diff --git a/tools/Jenkinsfile b/tools/Jenkinsfile new file mode 100644 index 0000000..19ad653 --- /dev/null +++ b/tools/Jenkinsfile @@ -0,0 +1,37 @@ +#!groovy + +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +pipeline { + agent any + options { + timestamps() + } + stages { + stage('Build RevealJS Template') { + when { + changeset "maven-revealjs-asciidoctor-templte/**" + } + steps { +// build 'maven-revealjs-asciidoctor-templte' + } + } + } +} \ No newline at end of file diff --git a/tools/pom.xml b/tools/pom.xml new file mode 100644 index 0000000..bcdb10f --- /dev/null +++ b/tools/pom.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/POM/4.0.0"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.training</groupId> + <artifactId>training-tools</artifactId> + <version>0.4.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Training: Tools</name> + + <modules> + <!--module>maven-revealjs-asciidoctor-templte</module--> + </modules> + +</project>
