[529487] Migrate EMF/XSD build to Tycho

ewillink · Jan 23, 2018 · 9d817f2 · 9d817f2
1 parent e0b2f25
commit 9d817f2
Show file tree

Hide file tree

Showing 132 changed files with 828 additions and 803 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 .project
+*.swp
+*/*/target/
diff --git a/doc/org.eclipse.xsd.cheatsheets/.project b/doc/org.eclipse.xsd.cheatsheets/.project
@@ -19,7 +19,7 @@
 			<name>org.eclipse.oomph.version.VersionBuilder</name>
 			<arguments>
 				<dictionary>
-					<key>ignore.missing.dependency.ranges</key>
+					<key>check.maven.pom</key>
 					<value>true</value>
 				</dictionary>
 				<dictionary>

diff --git a/doc/org.eclipse.xsd.cheatsheets/META-INF/MANIFEST.MF b/doc/org.eclipse.xsd.cheatsheets/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.cheatsheets;singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.7.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui.cheatsheets,
- org.eclipse.emf.cheatsheets,
- org.eclipse.xsd.ecore.importer
+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.8.0,3.0.0)"
diff --git a/doc/org.eclipse.xsd.cheatsheets/pom.xml b/doc/org.eclipse.xsd.cheatsheets/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.emf</groupId>
+    <artifactId>org.eclipse.emf.plugins</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.eclipse.emf/releng/org.eclipse.emf.parent/plugins</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.emf</groupId>
+  <artifactId>org.eclipse.xsd.cheatsheets</artifactId>
+  <version>2.7.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+</project>
diff --git a/doc/org.eclipse.xsd.doc-feature/.project b/doc/org.eclipse.xsd.doc-feature/.project
@@ -14,13 +14,17 @@
 			<name>org.eclipse.oomph.version.VersionBuilder</name>
 			<arguments>
 				<dictionary>
-					<key>ignore.missing.dependency.ranges</key>
+					<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>

diff --git a/doc/org.eclipse.xsd.doc-feature/feature.properties b/doc/org.eclipse.xsd.doc-feature/feature.properties
@@ -20,4 +20,4 @@ providerName=Eclipse Modeling Project
 # "description" property - description of the feature
 description=Documentation and tutorials for XSD.
 
-ModelingUpdateSiteName=Eclipse Modeling Project Updates
+EMFUpdateSiteName=Eclipse Modeling Framework Updates
diff --git a/doc/org.eclipse.xsd.doc-feature/feature.xml b/doc/org.eclipse.xsd.doc-feature/feature.xml
@@ -2,17 +2,17 @@
 <feature
       id="org.eclipse.xsd.doc"
       label="%featureName"
-      version="2.9.0.qualifier"
+      version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
-      license-feature-version="2.8.0.qualifier">
+      license-feature-version="2.9.0.qualifier">
 
    <description>
       %description
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2002-2011 IBM Corporation and others.
+      Copyright (c) 2002-2018 IBM Corporation and others.
 All rights reserved.   This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
@@ -24,8 +24,8 @@ http://www.eclipse.org/legal/epl-v10.html
    </license>
 
    <url>
-      <update label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
-      <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+      <update label="%EMFUpdateSiteName" url="http://download.eclipse.org/modeling/emf/emf/builds/"/>
+      <discovery label="%EMFUpdateSiteName" url="http://download.eclipse.org/modeling/emf/emf/builds/"/>
    </url>
 
    <plugin

diff --git a/doc/org.eclipse.xsd.doc-feature/pom.xml b/doc/org.eclipse.xsd.doc-feature/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.emf</groupId>
+    <artifactId>org.eclipse.emf.features</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.eclipse.emf/releng/org.eclipse.emf.parent/features</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.emf.features</groupId>
+  <artifactId>org.eclipse.xsd.doc</artifactId>
+  <version>2.10.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/doc/org.eclipse.xsd.doc/.project b/doc/org.eclipse.xsd.doc/.project
@@ -19,7 +19,7 @@
 			<name>org.eclipse.oomph.version.VersionBuilder</name>
 			<arguments>
 				<dictionary>
-					<key>ignore.missing.dependency.ranges</key>
+					<key>check.maven.pom</key>
 					<value>true</value>
 				</dictionary>
 				<dictionary>

diff --git a/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.xsd.doc/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.doc; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help
+Require-Bundle: org.eclipse.help;bundle-version="[3.5.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/doc/org.eclipse.xsd.doc/about.mappings b/doc/org.eclipse.xsd.doc/about.mappings
@@ -1,5 +1,5 @@
-# This file contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
+# about.mappings
+# contains fill-ins for about.properties
 
-0=@build@
+0=${build.id}
+1=${xsd.commit.id}
diff --git a/doc/org.eclipse.xsd.doc/about.properties b/doc/org.eclipse.xsd.doc/about.properties
@@ -17,7 +17,7 @@ featureText=XSD Documentation\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others. 2002, 2010.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others. 2002, 2018.  All rights reserved.\n\
 \n\
 XSD is a reference library for manipulating the components of an\n\
 XML Schema as described by the W3C XML Schema specifications.\n\

diff --git a/doc/org.eclipse.xsd.doc/buckminster.cspex b/doc/org.eclipse.xsd.doc/buckminster.cspex
diff --git a/doc/org.eclipse.xsd.doc/build.properties b/doc/org.eclipse.xsd.doc/build.properties
@@ -14,13 +14,12 @@ bin.includes = about.html,\
                about.mappings,\
                about.properties,\
                css/,\
-               cvsdoc/,\
                images/,\
                META-INF/,\
-               news/,\
                references/,\
                tutorials/,\
                modeling32.png,\
                plugin.xml,\
                plugin.properties,\
-               toc.xml
+               toc.xml,\
+               index/
diff --git a/doc/org.eclipse.xsd.doc/build/antJavadoc.sh b/doc/org.eclipse.xsd.doc/build/antJavadoc.sh