Updated jobs after project refactoring. (#107)

* Jobs update.
* Fixed spotbugs plugin config.
* Fixed javadoc configuration.
Signed-off-by: Tomas Kraus <Tomas.Kraus@oracle.com>

etc/config/copyright-exclude

@@ -29,6 +29,7 @@
 www
 site
 etc/config/copyright-exclude
+jaxb-api/src/main/javadoc/doc-files/speclicense.html
 jaxb-api-test/src/test/resources/logging.properties
 jaxb-api-test/src/test/resources/javax/xml/bind/test.policy
 jaxb-api-test/src/test/resources/jaxb/test/usr/jaxb.index

etc/jenkins/continuous.groovy

+// Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Distribution License v. 1.0, which is available at
+// http://www.eclipse.org/org/documents/edl-v10.php.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+// Job input parameters:
+//   SPEC_VERSION      - Specification version to release
+//   NEXT_SPEC_VERSION - Next specification snapshot version to set (e.g. 1.2.4-SNAPSHOT)
+//   API_VERSION       - API version to release
+//   NEXT_API_VERSION  - Next API snapshot version to set (e.g. 1.2.4-SNAPSHOT)
+//   BRANCH            - Branch to release
+//   DRY_RUN           - Do not publish artifacts to OSSRH and code changes to GitHub
+//   OVERWRITE         - Allows to overwrite existing version in git and OSSRH staging repositories
+
+// Job internal argumets:
+//   GIT_USER_NAME       - Git user name (for commits)
+//   GIT_USER_EMAIL      - Git user e-mail (for commits)
+//   SSH_CREDENTIALS_ID  - Jenkins ID of SSH credentials
+//   GPG_CREDENTIALS_ID  - Jenkins ID of GPG credentials (stored as KEYRING variable)
+//   SETTINGS_XML_ID     - Jenkins ID of settings.xml file
+//   SETTINGS_SEC_XML_ID - Jenkins ID of settings-security.xml file
+
+pipeline {
+    
+    agent any
+
+    tools {
+        jdk 'openjdk-jdk11-latest'
+        maven 'apache-maven-latest'
+    }
+
+    environment {
+        SPEC_DIR="${WORKSPACE}/spec"
+        API_DIR="${WORKSPACE}"
+    }
+
+    stages {
+        // Initialize build environment
+        stage('Init') {
+            steps {
+                git branch: BRANCH, credentialsId: SSH_CREDENTIALS_ID, url: GIT_URL
+                // GPG initialization
+                withCredentials([file(credentialsId: GPG_CREDENTIALS_ID, variable: 'KEYRING')]) {
+                    sh '''
+                        gpg --batch --import ${KEYRING}
+                        for fpr in $(gpg --list-keys --with-colons  | awk -F: '/fpr:/ {print $10}' | sort -u);
+                        do
+                          echo -e "5\ny\n" |  gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
+                        done
+
+                    '''
+                }
+                // Git configuration
+                sh '''
+                    git config --global user.name "${GIT_USER_NAME}"
+                    git config --global user.email "${GIT_USER_EMAIL}"
+                '''
+            }
+        }
+        // Perform release
+        stage('Build') {
+            steps {
+                configFileProvider([
+                        configFile(
+                            fileId: SETTINGS_XML_ID,
+                            targetLocation: '/home/jenkins/.m2/settings.xml'
+                        ), 
+                        configFile(
+                            fileId: SETTINGS_SEC_XML_ID, 
+                            targetLocation: '/home/jenkins/.m2/'
+                        )]) {
+                    sshagent([SSH_CREDENTIALS_ID]) {
+                        sh '''
+                            etc/jenkins/continuous.sh
+                        '''
+                    }
+                }
+                junit '**/target/surefire-reports/*.xml'
+                recordIssues(tools: [spotBugs(useRankAsPriority: true)])
+            }
+        }
+      
+    }
+
+}

etc/jenkins/continuous.sh

+#!/bin/bash -e
+#
+# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Distribution License v. 1.0, which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#
+# Arguments:
+#  N/A
+
+echo '-[ Jakarta XML Binding Specification Build ]------------------------------------'
+(cd spec && mvn -U -C -Psnapshots,oss-release clean install deploy)
+echo '-[ Jakarta XML Binding API Build ]----------------------------------------------'
+mvn -U -C -Psnapshots,oss-release clean install spotbugs:spotbugs deploy

etc/jenkins/release.groovy

+// Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Distribution License v. 1.0, which is available at
+// http://www.eclipse.org/org/documents/edl-v10.php.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
 // Job input parameters:
 //   SPEC_VERSION      - Specification version to release
 //   NEXT_SPEC_VERSION - Next specification snapshot version to set (e.g. 1.2.4-SNAPSHOT)

etc/jenkins/release.sh

 #!/bin/bash -ex
+#
+# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Distribution License v. 1.0, which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #
 # Arguments:
 #  $1 - SPEC_VERSION
@@ -15,8 +24,8 @@ NEXT_API_VERSION="${4}"
 DRY_RUN="${5}"
 OVERWRITE="${6}"
 
-. etc/scripts/mvn.sh
-. etc/scripts/nexus.sh
+. etc/scripts/maven.incl.sh
+. etc/scripts/nexus.incl.sh
 
 read_version 'SPEC' "${SPEC_DIR}"
 read_version 'API' "${API_DIR}"

etc/scripts/mvn.sh → etc/scripts/maven.incl.sh

+# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Distribution License v. 1.0, which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Maven plugins
 VERSIONS_PLUGIN='org.codehaus.mojo:versions-maven-plugin:2.7'
 HELP_PLUGIN='org.apache.maven.plugins:maven-help-plugin:3.2.0'

etc/scripts/nexus.sh → etc/scripts/nexus.incl.sh

+# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Distribution License v. 1.0, which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Drop old artifacts from staging repository
 # Arguments:
 #  $1 - Staging key value with grep REGEX prefixes

jaxb-api-test/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at

jaxb-api/exclude.xml

@@ -38,4 +38,13 @@
         <Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
     </Match>
 
+    <!--
+      https://github.com/eclipse-ee4j/jaxb-api/issues/78
+    -->
+    <Match>
+        <Class name="javax.xml.bind.ModuleUtil"/>
+        <Bug pattern="DM_STRING_TOSTRING"/>
+    </Match>
+
+
 </FindBugsFilter>

jaxb-api/pom.xml

@@ -84,6 +84,9 @@
                         <instructions>
                             <_noee>true</_noee>
                             <Bundle-Version>${project.version}</Bundle-Version>  <!-- 2.2.99.bnull -->
+                            <Bundle-Description>
+                                Jakarta XML Binding API ${spec.version} Design Specification
+                            </Bundle-Description>
                             <Extension-Name>${extension.name}</Extension-Name>
                             <Implementation-Version>${spec.version}.${impl.version}</Implementation-Version>
                             <Specification-Version>${spec.version}</Specification-Version>
@@ -121,9 +124,7 @@
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>${spotbugs.version}</version>
                     <configuration>
-                        <skip>${spotbugs.skip}</skip>
                         <threshold>${spotbugs.threshold}</threshold>
                         <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
                         <excludeFilterFile>
@@ -156,7 +157,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                         <groups>
                             <group>
                                 <title>Jakarta XML Binding API Packages</title>
-                                <packages>javax.xml.bind</packages>
+                                <packages>javax.xml.bind*</packages>
                             </group>
                         </groups>
                         <tags>

pom.xml

@@ -149,6 +149,14 @@
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>3.1.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-maven-plugin</artifactId>
+                    <version>${spotbugs.version}</version>
+                    <configuration>
+                        <skip>${spotbugs.skip}</skip>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>