Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorZoltan Ujhelyi2017-03-06 09:43:13 +0000
committerZoltan Ujhelyi2017-03-06 13:44:17 +0000
commitb805fe022570443be3da7c7666ade17bd318cb39 (patch)
tree560f11da82404ba05f583391683b111585ad44dc /releng
parentd403aaec7ccd70d25261cb9f59b76f742c0e118c (diff)
downloadorg.eclipse.emf.diffmerge.core-b805fe022570443be3da7c7666ade17bd318cb39.tar.gz
org.eclipse.emf.diffmerge.core-b805fe022570443be3da7c7666ade17bd318cb39.tar.xz
org.eclipse.emf.diffmerge.core-b805fe022570443be3da7c7666ade17bd318cb39.zip
[500320] Build configuration updates
This change turns updates Tycho version to 1.0.0; includes Javadoc generation; ensures target version compatibility and turns on code signing via a Maven profile. Remarks: * The package list files are copied from the corresponding published Javadoc settings. They are used the -linkoffline settings to work. * The signing was not tested as it requires to be run on hudson.eclipse.org but the configuration itself was reused from the VIATRA project. * In order for the toolchains to detect incorrect Java Standard Library usage (e.g. using Deque in a Java 5 project), a toolchains.xml file like available at (1) is required in the $HOME/.m2 folder. If no such file is set up, or does not contain the required JDK entries, the build will fail. See (2) for more detailed documentation about toolchains. (1) https://gist.github.com/ujhelyiz/2338f3346674c1328bca9466639fc11e (2) http://maven.apache.org/guides/mini/guide-using-toolchains.html Change-Id: I9b085ec49c6692dc911f28182159ebebc4deb7eb Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml82
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath6
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/.project28
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF6
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/build.properties9
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/eclipse-package-list287
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/emf-package-list51
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/j2se5-package-list166
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/osgi-package-list51
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml45
-rw-r--r--releng/pom.xml1
12 files changed, 736 insertions, 3 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index 97c8703a..1ec21007 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -6,9 +6,10 @@
<packaging>pom</packaging>
<properties>
- <tycho.version>0.25.0</tycho.version>
- <tycho.extras.version>0.25.0</tycho.extras.version>
+ <tycho.version>1.0.0</tycho.version>
+ <tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
</properties>
<build>
@@ -19,7 +20,7 @@
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
-
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
@@ -72,5 +73,80 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <useJDK>BREE</useJDK>
+ <useProjectSettings>true</useProjectSettings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>sign</id>
+ <activation>
+ <!-- Signing can be manually applied by -Psign; but can only be executed
+ on hudson.eclipse.org -->
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>pack200-normalize</id>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Note that plugins bound to same phase will be executed in the same
+ order as they are listed, so that metadata generated after signing -->
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>${cbi.jarsigner.version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>pack200-pack</id>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>cbi-releases</id>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath b/releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath
new file mode 100644
index 00000000..72d0ab2a
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/.project b/releng/org.eclipse.emf.diffmerge.core.javadoc/.project
new file mode 100644
index 00000000..7011a217
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.core.javadoc</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/.settings/org.eclipse.jdt.core.prefs b/releng/org.eclipse.emf.diffmerge.core.javadoc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..af0f20f9
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..f90d73f2
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Javadoc for DiffMerge Core
+Bundle-SymbolicName: org.eclipse.emf.diffmerge.core.javadoc
+Bundle-Version: 0.7.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/build.properties b/releng/org.eclipse.emf.diffmerge.core.javadoc/build.properties
new file mode 100644
index 00000000..be139ddf
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/build.properties
@@ -0,0 +1,9 @@
+bin.includes = META-INF/
+jars.extra.classpath = platform:/plugin/org.eclipse.emf.diffmerge,\
+ platform:/plugin/org.eclipse.emf.diffmerge.connector.core,\
+ platform:/plugin/org.eclipse.emf.diffmerge.connector.git,\
+ platform:/plugin/org.eclipse.emf.diffmerge.connector.svn,\
+ platform:/plugin/org.eclipse.emf.diffmerge.gmf,\
+ platform:/plugin/org.eclipse.emf.diffmerge.ui,\
+ platform:/plugin/org.eclipse.emf.diffmerge.ui.gmf,\
+ platform:/plugin/org.eclipse.emf.diffmerge.ui.sirius
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/eclipse-package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/eclipse-package-list
new file mode 100644
index 00000000..b421dc42
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/eclipse-package-list
@@ -0,0 +1,287 @@
+org.apache.felix.scr
+org.eclipse.ant.core
+org.eclipse.compare
+org.eclipse.compare.contentmergeviewer
+org.eclipse.compare.patch
+org.eclipse.compare.rangedifferencer
+org.eclipse.compare.structuremergeviewer
+org.eclipse.core.commands
+org.eclipse.core.commands.common
+org.eclipse.core.commands.contexts
+org.eclipse.core.commands.operations
+org.eclipse.core.databinding
+org.eclipse.core.databinding.beans
+org.eclipse.core.databinding.conversion
+org.eclipse.core.databinding.observable
+org.eclipse.core.databinding.observable.list
+org.eclipse.core.databinding.observable.map
+org.eclipse.core.databinding.observable.masterdetail
+org.eclipse.core.databinding.observable.set
+org.eclipse.core.databinding.observable.value
+org.eclipse.core.databinding.property
+org.eclipse.core.databinding.property.list
+org.eclipse.core.databinding.property.map
+org.eclipse.core.databinding.property.set
+org.eclipse.core.databinding.property.value
+org.eclipse.core.databinding.util
+org.eclipse.core.databinding.validation
+org.eclipse.core.expressions
+org.eclipse.core.filebuffers
+org.eclipse.core.filebuffers.manipulation
+org.eclipse.core.filesystem
+org.eclipse.core.filesystem.provider
+org.eclipse.core.net.proxy
+org.eclipse.core.resources
+org.eclipse.core.resources.filtermatchers
+org.eclipse.core.resources.mapping
+org.eclipse.core.resources.refresh
+org.eclipse.core.resources.team
+org.eclipse.core.resources.variableresolvers
+org.eclipse.core.runtime
+org.eclipse.core.runtime.adaptor
+org.eclipse.core.runtime.content
+org.eclipse.core.runtime.dynamichelpers
+org.eclipse.core.runtime.jobs
+org.eclipse.core.runtime.model
+org.eclipse.core.runtime.preferences
+org.eclipse.core.runtime.spi
+org.eclipse.core.variables
+org.eclipse.debug.core
+org.eclipse.debug.core.commands
+org.eclipse.debug.core.model
+org.eclipse.debug.core.sourcelookup
+org.eclipse.debug.core.sourcelookup.containers
+org.eclipse.debug.ui
+org.eclipse.debug.ui.actions
+org.eclipse.debug.ui.console
+org.eclipse.debug.ui.contexts
+org.eclipse.debug.ui.memory
+org.eclipse.debug.ui.sourcelookup
+org.eclipse.e4.core.contexts
+org.eclipse.e4.core.di.annotations
+org.eclipse.e4.core.services.events
+org.eclipse.e4.ui.di
+org.eclipse.e4.ui.model.application
+org.eclipse.e4.ui.model.application.commands
+org.eclipse.e4.ui.model.application.descriptor.basic
+org.eclipse.e4.ui.model.application.ui
+org.eclipse.e4.ui.model.application.ui.advanced
+org.eclipse.e4.ui.model.application.ui.basic
+org.eclipse.e4.ui.model.application.ui.menu
+org.eclipse.e4.ui.model.fragment
+org.eclipse.e4.ui.services
+org.eclipse.e4.ui.workbench
+org.eclipse.e4.ui.workbench.modeling
+org.eclipse.equinox.app
+org.eclipse.equinox.bidi
+org.eclipse.equinox.bidi.advanced
+org.eclipse.equinox.bidi.custom
+org.eclipse.equinox.frameworkadmin
+org.eclipse.equinox.http.jetty
+org.eclipse.equinox.http.registry
+org.eclipse.equinox.http.servlet
+org.eclipse.equinox.jsp.jasper
+org.eclipse.equinox.jsp.jasper.registry
+org.eclipse.equinox.p2.core
+org.eclipse.equinox.p2.core.spi
+org.eclipse.equinox.p2.engine
+org.eclipse.equinox.p2.engine.query
+org.eclipse.equinox.p2.engine.spi
+org.eclipse.equinox.p2.metadata
+org.eclipse.equinox.p2.metadata.expression
+org.eclipse.equinox.p2.metadata.index
+org.eclipse.equinox.p2.operations
+org.eclipse.equinox.p2.planner
+org.eclipse.equinox.p2.ql
+org.eclipse.equinox.p2.query
+org.eclipse.equinox.p2.repository
+org.eclipse.equinox.p2.repository.artifact
+org.eclipse.equinox.p2.repository.artifact.spi
+org.eclipse.equinox.p2.repository.metadata
+org.eclipse.equinox.p2.repository.metadata.spi
+org.eclipse.equinox.p2.repository.spi
+org.eclipse.equinox.p2.touchpoint.eclipse.query
+org.eclipse.equinox.p2.ui
+org.eclipse.equinox.security.auth
+org.eclipse.equinox.security.auth.credentials
+org.eclipse.equinox.security.auth.module
+org.eclipse.equinox.security.storage
+org.eclipse.equinox.security.storage.provider
+org.eclipse.help
+org.eclipse.help.base
+org.eclipse.help.browser
+org.eclipse.help.search
+org.eclipse.help.server
+org.eclipse.help.standalone
+org.eclipse.help.ui
+org.eclipse.help.ui.browser
+org.eclipse.help.webapp
+org.eclipse.jface.action
+org.eclipse.jface.bindings
+org.eclipse.jface.bindings.keys
+org.eclipse.jface.bindings.keys.formatting
+org.eclipse.jface.commands
+org.eclipse.jface.contentassist
+org.eclipse.jface.contexts
+org.eclipse.jface.databinding.dialog
+org.eclipse.jface.databinding.preference
+org.eclipse.jface.databinding.swt
+org.eclipse.jface.databinding.util
+org.eclipse.jface.databinding.viewers
+org.eclipse.jface.databinding.wizard
+org.eclipse.jface.dialogs
+org.eclipse.jface.fieldassist
+org.eclipse.jface.layout
+org.eclipse.jface.menus
+org.eclipse.jface.operation
+org.eclipse.jface.preference
+org.eclipse.jface.resource
+org.eclipse.jface.text
+org.eclipse.jface.text.contentassist
+org.eclipse.jface.text.formatter
+org.eclipse.jface.text.hyperlink
+org.eclipse.jface.text.information
+org.eclipse.jface.text.link
+org.eclipse.jface.text.presentation
+org.eclipse.jface.text.projection
+org.eclipse.jface.text.quickassist
+org.eclipse.jface.text.reconciler
+org.eclipse.jface.text.revisions
+org.eclipse.jface.text.rules
+org.eclipse.jface.text.source
+org.eclipse.jface.text.source.projection
+org.eclipse.jface.text.templates
+org.eclipse.jface.text.templates.persistence
+org.eclipse.jface.util
+org.eclipse.jface.viewers
+org.eclipse.jface.viewers.deferred
+org.eclipse.jface.window
+org.eclipse.jface.wizard
+org.eclipse.jsch.core
+org.eclipse.jsch.ui
+org.eclipse.ltk.core.refactoring
+org.eclipse.ltk.core.refactoring.history
+org.eclipse.ltk.core.refactoring.model
+org.eclipse.ltk.core.refactoring.participants
+org.eclipse.ltk.core.refactoring.resource
+org.eclipse.ltk.ui.refactoring
+org.eclipse.ltk.ui.refactoring.actions
+org.eclipse.ltk.ui.refactoring.history
+org.eclipse.ltk.ui.refactoring.model
+org.eclipse.ltk.ui.refactoring.resource
+org.eclipse.osgi.framework.console
+org.eclipse.osgi.framework.eventmgr
+org.eclipse.osgi.framework.log
+org.eclipse.osgi.launch
+org.eclipse.osgi.service.datalocation
+org.eclipse.osgi.service.debug
+org.eclipse.osgi.service.environment
+org.eclipse.osgi.service.localization
+org.eclipse.osgi.service.resolver
+org.eclipse.osgi.service.runnable
+org.eclipse.osgi.service.security
+org.eclipse.osgi.signedcontent
+org.eclipse.osgi.storagemanager
+org.eclipse.osgi.util
+org.eclipse.search.core.text
+org.eclipse.search.ui
+org.eclipse.search.ui.actions
+org.eclipse.search.ui.text
+org.eclipse.swt
+org.eclipse.swt.accessibility
+org.eclipse.swt.awt
+org.eclipse.swt.browser
+org.eclipse.swt.custom
+org.eclipse.swt.dnd
+org.eclipse.swt.events
+org.eclipse.swt.graphics
+org.eclipse.swt.layout
+org.eclipse.swt.ole.win32
+org.eclipse.swt.opengl
+org.eclipse.swt.printing
+org.eclipse.swt.program
+org.eclipse.swt.widgets
+org.eclipse.team.core
+org.eclipse.team.core.diff
+org.eclipse.team.core.diff.provider
+org.eclipse.team.core.history
+org.eclipse.team.core.history.provider
+org.eclipse.team.core.mapping
+org.eclipse.team.core.mapping.provider
+org.eclipse.team.core.subscribers
+org.eclipse.team.core.synchronize
+org.eclipse.team.core.variants
+org.eclipse.team.ui
+org.eclipse.team.ui.history
+org.eclipse.team.ui.mapping
+org.eclipse.team.ui.synchronize
+org.eclipse.text.edits
+org.eclipse.text.undo
+org.eclipse.ui
+org.eclipse.ui.about
+org.eclipse.ui.actions
+org.eclipse.ui.activities
+org.eclipse.ui.application
+org.eclipse.ui.branding
+org.eclipse.ui.browser
+org.eclipse.ui.cheatsheets
+org.eclipse.ui.commands
+org.eclipse.ui.console
+org.eclipse.ui.console.actions
+org.eclipse.ui.contentassist
+org.eclipse.ui.contexts
+org.eclipse.ui.databinding
+org.eclipse.ui.dialogs
+org.eclipse.ui.editors.text
+org.eclipse.ui.editors.text.templates
+org.eclipse.ui.fieldassist
+org.eclipse.ui.forms
+org.eclipse.ui.forms.editor
+org.eclipse.ui.forms.events
+org.eclipse.ui.forms.widgets
+org.eclipse.ui.handlers
+org.eclipse.ui.help
+org.eclipse.ui.ide
+org.eclipse.ui.ide.dialogs
+org.eclipse.ui.ide.fileSystem
+org.eclipse.ui.ide.undo
+org.eclipse.ui.intro
+org.eclipse.ui.intro.config
+org.eclipse.ui.intro.contentproviders
+org.eclipse.ui.intro.universal
+org.eclipse.ui.keys
+org.eclipse.ui.menus
+org.eclipse.ui.model
+org.eclipse.ui.navigator
+org.eclipse.ui.navigator.resources
+org.eclipse.ui.operations
+org.eclipse.ui.part
+org.eclipse.ui.plugin
+org.eclipse.ui.preferences
+org.eclipse.ui.presentations
+org.eclipse.ui.progress
+org.eclipse.ui.services
+org.eclipse.ui.splash
+org.eclipse.ui.statushandlers
+org.eclipse.ui.swt
+org.eclipse.ui.testing
+org.eclipse.ui.texteditor
+org.eclipse.ui.texteditor.link
+org.eclipse.ui.texteditor.quickdiff
+org.eclipse.ui.texteditor.rulers
+org.eclipse.ui.texteditor.spelling
+org.eclipse.ui.texteditor.templates
+org.eclipse.ui.themes
+org.eclipse.ui.views
+org.eclipse.ui.views.bookmarkexplorer
+org.eclipse.ui.views.contentoutline
+org.eclipse.ui.views.framelist
+org.eclipse.ui.views.markers
+org.eclipse.ui.views.navigator
+org.eclipse.ui.views.properties
+org.eclipse.ui.views.properties.tabbed
+org.eclipse.ui.views.tasklist
+org.eclipse.ui.wizards
+org.eclipse.ui.wizards.datatransfer
+org.eclipse.ui.wizards.newresource
+org.eclipse.update.configurator
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/emf-package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/emf-package-list
new file mode 100644
index 00000000..d84aed6e
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/emf-package-list
@@ -0,0 +1,51 @@
+info.dmtree
+info.dmtree.notification
+info.dmtree.notification.spi
+info.dmtree.registry
+info.dmtree.security
+info.dmtree.spi
+org.osgi.application
+org.osgi.framework
+org.osgi.framework.hooks.service
+org.osgi.framework.launch
+org.osgi.jmx
+org.osgi.jmx.framework
+org.osgi.jmx.service.cm
+org.osgi.jmx.service.permissionadmin
+org.osgi.jmx.service.provisioning
+org.osgi.jmx.service.useradmin
+org.osgi.service.application
+org.osgi.service.blueprint.container
+org.osgi.service.blueprint.reflect
+org.osgi.service.cm
+org.osgi.service.component
+org.osgi.service.condpermadmin
+org.osgi.service.deploymentadmin
+org.osgi.service.deploymentadmin.spi
+org.osgi.service.device
+org.osgi.service.event
+org.osgi.service.http
+org.osgi.service.io
+org.osgi.service.jdbc
+org.osgi.service.jndi
+org.osgi.service.jpa
+org.osgi.service.log
+org.osgi.service.metatype
+org.osgi.service.monitor
+org.osgi.service.packageadmin
+org.osgi.service.permissionadmin
+org.osgi.service.prefs
+org.osgi.service.provisioning
+org.osgi.service.remoteserviceadmin
+org.osgi.service.startlevel
+org.osgi.service.upnp
+org.osgi.service.url
+org.osgi.service.useradmin
+org.osgi.service.wireadmin
+org.osgi.util.cdma
+org.osgi.util.gsm
+org.osgi.util.measurement
+org.osgi.util.mobile
+org.osgi.util.position
+org.osgi.util.tracker
+org.osgi.util.xml
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/j2se5-package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/j2se5-package-list
new file mode 100644
index 00000000..48783362
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/j2se5-package-list
@@ -0,0 +1,166 @@
+java.applet
+java.awt
+java.awt.color
+java.awt.datatransfer
+java.awt.dnd
+java.awt.event
+java.awt.font
+java.awt.geom
+java.awt.im
+java.awt.im.spi
+java.awt.image
+java.awt.image.renderable
+java.awt.print
+java.beans
+java.beans.beancontext
+java.io
+java.lang
+java.lang.annotation
+java.lang.instrument
+java.lang.management
+java.lang.ref
+java.lang.reflect
+java.math
+java.net
+java.nio
+java.nio.channels
+java.nio.channels.spi
+java.nio.charset
+java.nio.charset.spi
+java.rmi
+java.rmi.activation
+java.rmi.dgc
+java.rmi.registry
+java.rmi.server
+java.security
+java.security.acl
+java.security.cert
+java.security.interfaces
+java.security.spec
+java.sql
+java.text
+java.util
+java.util.concurrent
+java.util.concurrent.atomic
+java.util.concurrent.locks
+java.util.jar
+java.util.logging
+java.util.prefs
+java.util.regex
+java.util.zip
+javax.accessibility
+javax.activity
+javax.crypto
+javax.crypto.interfaces
+javax.crypto.spec
+javax.imageio
+javax.imageio.event
+javax.imageio.metadata
+javax.imageio.plugins.bmp
+javax.imageio.plugins.jpeg
+javax.imageio.spi
+javax.imageio.stream
+javax.management
+javax.management.loading
+javax.management.modelmbean
+javax.management.monitor
+javax.management.openmbean
+javax.management.relation
+javax.management.remote
+javax.management.remote.rmi
+javax.management.timer
+javax.naming
+javax.naming.directory
+javax.naming.event
+javax.naming.ldap
+javax.naming.spi
+javax.net
+javax.net.ssl
+javax.print
+javax.print.attribute
+javax.print.attribute.standard
+javax.print.event
+javax.rmi
+javax.rmi.CORBA
+javax.rmi.ssl
+javax.security.auth
+javax.security.auth.callback
+javax.security.auth.kerberos
+javax.security.auth.login
+javax.security.auth.spi
+javax.security.auth.x500
+javax.security.cert
+javax.security.sasl
+javax.sound.midi
+javax.sound.midi.spi
+javax.sound.sampled
+javax.sound.sampled.spi
+javax.sql
+javax.sql.rowset
+javax.sql.rowset.serial
+javax.sql.rowset.spi
+javax.swing
+javax.swing.border
+javax.swing.colorchooser
+javax.swing.event
+javax.swing.filechooser
+javax.swing.plaf
+javax.swing.plaf.basic
+javax.swing.plaf.metal
+javax.swing.plaf.multi
+javax.swing.plaf.synth
+javax.swing.table
+javax.swing.text
+javax.swing.text.html
+javax.swing.text.html.parser
+javax.swing.text.rtf
+javax.swing.tree
+javax.swing.undo
+javax.transaction
+javax.transaction.xa
+javax.xml
+javax.xml.datatype
+javax.xml.namespace
+javax.xml.parsers
+javax.xml.transform
+javax.xml.transform.dom
+javax.xml.transform.sax
+javax.xml.transform.stream
+javax.xml.validation
+javax.xml.xpath
+org.ietf.jgss
+org.omg.CORBA
+org.omg.CORBA.DynAnyPackage
+org.omg.CORBA.ORBPackage
+org.omg.CORBA.TypeCodePackage
+org.omg.CORBA.portable
+org.omg.CORBA_2_3
+org.omg.CORBA_2_3.portable
+org.omg.CosNaming
+org.omg.CosNaming.NamingContextExtPackage
+org.omg.CosNaming.NamingContextPackage
+org.omg.Dynamic
+org.omg.DynamicAny
+org.omg.DynamicAny.DynAnyFactoryPackage
+org.omg.DynamicAny.DynAnyPackage
+org.omg.IOP
+org.omg.IOP.CodecFactoryPackage
+org.omg.IOP.CodecPackage
+org.omg.Messaging
+org.omg.PortableInterceptor
+org.omg.PortableInterceptor.ORBInitInfoPackage
+org.omg.PortableServer
+org.omg.PortableServer.CurrentPackage
+org.omg.PortableServer.POAManagerPackage
+org.omg.PortableServer.POAPackage
+org.omg.PortableServer.ServantLocatorPackage
+org.omg.PortableServer.portable
+org.omg.SendingContext
+org.omg.stub.java.rmi
+org.w3c.dom
+org.w3c.dom.bootstrap
+org.w3c.dom.events
+org.w3c.dom.ls
+org.xml.sax
+org.xml.sax.ext
+org.xml.sax.helpers
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/osgi-package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/osgi-package-list
new file mode 100644
index 00000000..d84aed6e
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/osgi-package-list
@@ -0,0 +1,51 @@
+info.dmtree
+info.dmtree.notification
+info.dmtree.notification.spi
+info.dmtree.registry
+info.dmtree.security
+info.dmtree.spi
+org.osgi.application
+org.osgi.framework
+org.osgi.framework.hooks.service
+org.osgi.framework.launch
+org.osgi.jmx
+org.osgi.jmx.framework
+org.osgi.jmx.service.cm
+org.osgi.jmx.service.permissionadmin
+org.osgi.jmx.service.provisioning
+org.osgi.jmx.service.useradmin
+org.osgi.service.application
+org.osgi.service.blueprint.container
+org.osgi.service.blueprint.reflect
+org.osgi.service.cm
+org.osgi.service.component
+org.osgi.service.condpermadmin
+org.osgi.service.deploymentadmin
+org.osgi.service.deploymentadmin.spi
+org.osgi.service.device
+org.osgi.service.event
+org.osgi.service.http
+org.osgi.service.io
+org.osgi.service.jdbc
+org.osgi.service.jndi
+org.osgi.service.jpa
+org.osgi.service.log
+org.osgi.service.metatype
+org.osgi.service.monitor
+org.osgi.service.packageadmin
+org.osgi.service.permissionadmin
+org.osgi.service.prefs
+org.osgi.service.provisioning
+org.osgi.service.remoteserviceadmin
+org.osgi.service.startlevel
+org.osgi.service.upnp
+org.osgi.service.url
+org.osgi.service.useradmin
+org.osgi.service.wireadmin
+org.osgi.util.cdma
+org.osgi.util.gsm
+org.osgi.util.measurement
+org.osgi.util.mobile
+org.osgi.util.position
+org.osgi.util.tracker
+org.osgi.util.xml
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
new file mode 100644
index 00000000..f2c3dc60
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
@@ -0,0 +1,45 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.eclipse.emf.diffmerge.core.javadoc</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.eclipse.emf.diffmerge</groupId>
+ <artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-document-bundle-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>eclipse-javadoc</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <!-- Do not generate toc.xml for Eclipse help -->
+ <skipTocGen>true</skipTocGen>
+ <javadocOptions>
+ <additionalArguments>
+ <ignoreError>false</ignoreError>
+ <additionalArgument>-linkoffline http://download.oracle.com/javase/1.5.0/docs/api/ ${project.basedir}/j2se5-package-list</additionalArgument>
+ <additionalArgument>-linkoffline http://www.osgi.org/javadoc/r4v42/ ${project.basedir}/osgi-package-list</additionalArgument>
+ <additionalArgument>-linkoffline http://download.eclipse.org/modeling/emf/emf/javadoc/2.5.0/ ${project.basedir}/emf-package-list</additionalArgument>
+ <additionalArgument>-linkoffline http://help.eclipse.org/galileo/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/api/ ${project.basedir}/eclipse-package-list</additionalArgument>
+ <additionalArgument>-public</additionalArgument>
+ </additionalArguments>
+ </javadocOptions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
diff --git a/releng/pom.xml b/releng/pom.xml
index ce055c0b..05b5834a 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -12,6 +12,7 @@
<modules>
<module>org.eclipse.emf.diffmerge.update</module>
<module>org.eclipse.emf.diffmerge.target</module>
+ <module>org.eclipse.emf.diffmerge.core.javadoc</module>
</modules>
</project>

Back to the top