Merge in the org.eclipse.xsd Git repository

Reuse JustJ's update site generator for promotion of builds. Provide a Jenkinsfile to prepare for a multi-branch pipeline job. Stop building pack200 artifacts. Use https for download.itemis.com. Include the root of the repository as a project. https://gitlab.eclipse.org/eclipsefdn/emo-team/emo/-/issues/430 Change-Id: Ibe27c53175bcbaa66c693f6b4db8299a39185e0f Signed-off-by: Ed Merks <[email protected]>
ewillink · Jan 2, 2023 · a331c7f · a331c7f
2 parents 4ce7c6c + d4765e2
commit a331c7f
Show file tree

Hide file tree

Showing 1,085 changed files with 162,250 additions and 422 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.swp
 */*/target/
+*/*/*/target/
 **/.oracle_jre_usage
 .DS_Store
diff --git a/.project b/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.git</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1671959598310</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-projectRelativePath-matches-false-true-.*/.*</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,7 +12,10 @@ enable viewing and command-based editing of the model, and a basic editor.
 Models can be specified using annotated Java, XML documents, or modeling tools
 like Rational Rose, then imported into EMF. Most important of all, EMF provides
 the foundation for interoperability with other EMF-based tools and applications.
-For more detailed information see the EMF Overviews and Project Plan.
+
+Eclipse XSD is a library that provides an API for manipulating the components of
+an XML Schema as described by the W3C XML Schema specifications, as well as an
+API for manipulating the DOM-accessible representation of XML.
 
 * https://www.eclipse.org/modeling/emf/
 * https://projects.eclipse.org/projects/modeling.emf.emf
@@ -36,7 +39,7 @@ This project uses Bugzilla to track ongoing development and issues.
 Be sure to search for existing bugs before you create another one. Remember that
 contributions are always welcome!
 
-This project is built, along with XSD, using Maven/Tycho.
+This project is built using Maven/Tycho.
 Instructions for setting up a development environment and for replicating the build locally are provided here:
 
 * https://ci.eclipse.org/emf/

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,212 @@
+pipeline {
+  agent {
+    label 'centos-latest'
+  }
+
+  options {
+    buildDiscarder(logRotator(numToKeepStr: '10'))
+    disableConcurrentBuilds()
+    // skipDefaultCheckout true
+  }
+
+  tools {
+    maven 'apache-maven-latest'
+    jdk 'temurin-jdk11-latest'
+  }
+
+  environment {
+    PUBLISH_LOCATION = 'builds'
+    BUILD_TIMESTAMP = sh(returnStdout: true, script: 'date +%Y%m%d%H%M').trim()
+    CHECKOUT = 'false'
+  }
+
+  parameters {
+    choice(
+      name: 'BUILD_TYPE',
+      choices: ['nightly', 'milestone', 'release'],
+      description: '''
+        Choose the type of build.
+        Note that a release build will not promote the build, but rather will promote the most recent milestone build.
+        '''
+    )
+
+    choice(
+      name: 'TARGET_PLATFORM',
+      choices: [
+        '2023-03',
+        '2022-12',
+        '2022-09',
+        '2022-06',
+        '2022-03',
+        '2021-12',
+        '2021-09',
+        '2021-06',
+        '2021-03',
+        '2020-12',
+        '2020-09',
+        '2020-06',
+        '2020-03',
+        '2019-12',
+        '2019-09',
+        '2019-06',
+        '2019-03',
+        '2018-12',
+        '2018-09',
+        'photon',
+        'oxygen',
+        'neon',
+        'mars',
+        'luna',
+        'kepler',
+        'juno',
+        'indigo',
+        'helios'
+      ],
+      description: '''
+        Choose the named target platform against which to compile and test.
+        This is relevant only for nightly and milestone builds.
+        '''
+    )
+
+    choice(
+      name: 'JAVA_VERSION',
+      choices: ['11', '1.8'],
+      description: '''
+        Choose the Java version for the execution environment of the Tycho build.
+        '''
+    )
+
+    booleanParam(
+      name: 'ECLIPSE_SIGN',
+      defaultValue: false,
+      description: '''
+        Choose whether or not the bundles will be signed.
+        This is relevant only for nightly and milestone builds.
+      '''
+    )
+
+    booleanParam(
+      name: 'PROMOTE',
+      defaultValue: false,
+      description: 'Whether to promote the build to the download server.'
+    )
+
+    booleanParam(
+      name: 'ARCHIVE',
+      defaultValue: false,
+      description: 'Whether to archive the workspace.'
+    )
+  }
+
+  stages {
+    stage('Display Parameters') {
+      steps {
+        echo "BUILD_TIMESTAMP=${env.BUILD_TIMESTAMP}"
+        echo "BUILD_TYPE=${params.BUILD_TYPE}"
+        echo "JAVA_VERSION=${params.JAVA_VERSION}"
+        echo "TARGET_PLATFORM=${params.TARGET_PLATFORM}"
+        echo "ECLIPSE_SIGN=${params.ECLIPSE_SIGN}"
+        echo "PROMOTE=${params.PROMOTE}"
+        echo "ARCHIVE=${params.ARCHIVE}"
+        script {
+          env.BUILD_TYPE = params.BUILD_TYPE
+          env.JAVA_VERSION = params.JAVA_VERSION
+          env.TARGET_PLATFORM = params.TARGET_PLATFORM
+          env.ECLIPSE_SIGN = params.ECLIPSE_SIGN
+          env.PROMOTE = params.PROMOTE && env.ECLIPSE_SIGN
+        }
+      }
+    }
+
+    stage('Git Checkout') {
+      when {
+        environment name: 'CHECKOUT', value: 'true'
+      }
+      steps {
+        script {
+          def gitVariables = checkout(
+            poll: false,
+            scm: [
+              $class: 'GitSCM',
+              branches: [[name: '*' + '/master']],
+              doGenerateSubmoduleConfigurations: false,
+              // extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'emf']],
+              submoduleCfg: [],
+              userRemoteConfigs: [[url: 'https://git.eclipse.org/r/emf/org.eclipse.emf.git']]
+              // userRemoteConfigs: [[url: 'https://github.com/eclipse-emf/emf.git']]
+              // userRemoteConfigs: [[url: 'https://github.com/merks/emf-xsd.git']]
+            ]
+          )
+
+          echo "$gitVariables"
+          env.GIT_COMMIT = gitVariables.GIT_COMMIT
+        }
+      }
+    }
+
+    stage('Build') {
+      steps {
+        sshagent(['projects-storage.eclipse.org-bot-ssh']) {
+          dir('.') {
+            sh '''
+              if [[ $PROMOTE == false ]]; then
+                promotion_argument='-Dpromote=false -Dorg.eclipse.justj.p2.manager.args='
+              fi
+              mvn  \
+                --fail-at-end \
+                --no-transfer-progress \
+                $promotion_argument \
+                -Dmaven.artifact.threads=16 \
+                -Dbuild.id=${BUILD_TIMESTAMP} \
+                -Dcommit.id=$GIT_COMMIT \
+                -DECLIPSE_SIGN=${ECLIPSE_SIGN} \
+                -Dtarget-platform=${TARGET_PLATFORM} \
+                -DjavaVersion=${JAVA_VERSION} \
+                -Dbuild.type=$BUILD_TYPE \
+                -Dorg.eclipse.justj.p2.manager.build.url=$JOB_URL \
+                -Dorg.eclipse.justj.p2.manager.relative=$PUBLISH_LOCATION \
+                clean \
+                verify
+              '''
+          }
+        }
+      }
+    }
+
+    stage('Archive Results') {
+      when {
+        expression {
+          params.ARCHIVE
+        }
+      }
+      steps {
+        archiveArtifacts '**'
+      }
+    }
+  }
+
+  post {
+    failure {
+      mail to: '[email protected]',
+      subject: "[EMF CI] Build Failure ${currentBuild.fullDisplayName}",
+      mimeType: 'text/html',
+      body: "Project: ${env.JOB_NAME}<br/>Build Number: ${env.BUILD_NUMBER}<br/>Build URL: ${env.BUILD_URL}<br/>Console: ${env.BUILD_URL}/console"
+      archiveArtifacts allowEmptyArchive: true, artifacts: '**'
+    }
+
+    fixed {
+      mail to: '[email protected]',
+      subject: "[EMF CI] Back to normal ${currentBuild.fullDisplayName}",
+      mimeType: 'text/html',
+      body: "Project: ${env.JOB_NAME}<br/>Build Number: ${env.BUILD_NUMBER}<br/>Build URL: ${env.BUILD_URL}<br/>Console: ${env.BUILD_URL}/console"
+    }
+
+    always {
+      junit '**/target/surefire-reports/TEST-*.xml'
+    }
+
+    cleanup {
+      deleteDir()
+    }
+  }
+}
diff --git a/NOTICE.md b/NOTICE.md
@@ -7,7 +7,7 @@ This content is produced and maintained by the Eclipse EMF project.
 
 ## Trademarks
 
-Eclipse EMF, EMF, and Ecore are trademarks of the Eclipse Foundation.
+Eclipse EMF, EMF, and Ecore as well as Eclipse XSD and XSD, are trademarks of the Eclipse Foundation.
 
 ## Copyright
 
@@ -29,22 +29,6 @@ The project maintains the following source code repositories:
 
 * http://git.eclipse.org/c/emf/org.eclipse.emf.git
 
-## Third-party Content
-
-This project leverages the following third party content.
-
-Google Web Toolkit GWT User Library (2.0.3)
-
-* License: Apache License, 2.0
-
-Tomcat (3.2.4)
-
-* License: Apache Software License 1.1
-
-Xerces (2.11.0)
-
-* License: Apache License, 2.0, W3C
-
 ## Cryptography
 
 Content may contain encryption software. The country in which you are currently

diff --git a/doc/org.eclipse.emf.doc/about.mappings b/doc/org.eclipse.emf.doc/about.mappings
@@ -2,4 +2,4 @@
 # contains fill-ins for about.properties
 
 0=${build.id}
-1=${emf.commit.id}
+1=${commit.id}
diff --git a/doc/org.eclipse.xsd.cheatsheets/.gitignore b/doc/org.eclipse.xsd.cheatsheets/.gitignore
@@ -0,0 +1 @@
+archive
diff --git a/doc/org.eclipse.xsd.cheatsheets/.project b/doc/org.eclipse.xsd.cheatsheets/.project
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.xsd.cheatsheets</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.export.versions</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.schema.builder</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.xsd/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/doc/org.eclipse.xsd.cheatsheets/META-INF/MANIFEST.MF b/doc/org.eclipse.xsd.cheatsheets/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.xsd.cheatsheets;singleton:=true
+Bundle-Version: 2.8.0.qualifier
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui.cheatsheets;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.emf.cheatsheets;bundle-version="[2.7.0,3.0.0)",
+ org.eclipse.xsd.ecore.importer;bundle-version="[2.9.0,3.0.0)"
diff --git a/doc/org.eclipse.xsd.cheatsheets/about.html b/doc/org.eclipse.xsd.cheatsheets/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>November 22, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/doc/org.eclipse.xsd.cheatsheets/build.properties b/doc/org.eclipse.xsd.cheatsheets/build.properties
@@ -0,0 +1,7 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               cheatsheets/,\
+               plugin.properties,\
+               about.html
+src.includes = about.html
+