Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2019-10-01 10:20:25 +0000
committerOlivier Constant2019-10-02 07:18:07 +0000
commit83faa4e19a0278fcbfcc281109c7716b620d4d43 (patch)
tree275965ea51352e603e3b5d7d5f3866947e334ce4
parent43388c6a59bf97580b7d43f2c287bdb6a3454a7d (diff)
downloadorg.eclipse.emf.diffmerge.core-83faa4e19a0278fcbfcc281109c7716b620d4d43.tar.gz
org.eclipse.emf.diffmerge.core-83faa4e19a0278fcbfcc281109c7716b620d4d43.tar.xz
org.eclipse.emf.diffmerge.core-83faa4e19a0278fcbfcc281109c7716b620d4d43.zip
[releng] Fixed javadoc
Change-Id: If24b64cf9cf874686be84e545afa256b449698a2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath2
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF2
-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/osgi-package-list51
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/emf/package-list197
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/java/package-list (renamed from releng/org.eclipse.emf.diffmerge.core.javadoc/j2se5-package-list)51
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/osgi/package-list13
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml10
10 files changed, 270 insertions, 400 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath b/releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath
index 72d0ab2a..7d9b38e7 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath
@@ -1,6 +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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
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
index af0f20f9..c537b630 100644
--- 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
@@ -1,7 +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.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
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
index 82836e98..17d4cf35 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: Javadoc for Diff/Merge Core (Incubation)
Bundle-SymbolicName: org.eclipse.emf.diffmerge.core.javadoc
Bundle-Version: 0.12.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Automatic-Module-Name: org.eclipse.emf.diffmerge.core.javadoc
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/eclipse-package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/eclipse-package-list
deleted file mode 100644
index b421dc42..00000000
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/eclipse-package-list
+++ /dev/null
@@ -1,287 +0,0 @@
-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
deleted file mode 100644
index d84aed6e..00000000
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/emf-package-list
+++ /dev/null
@@ -1,51 +0,0 @@
-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/osgi-package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/osgi-package-list
deleted file mode 100644
index d84aed6e..00000000
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/osgi-package-list
+++ /dev/null
@@ -1,51 +0,0 @@
-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/package-lists/emf/package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/emf/package-list
new file mode 100644
index 00000000..e667a640
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/emf/package-list
@@ -0,0 +1,197 @@
+org.eclipse.emf.ant
+org.eclipse.emf.ant.taskdefs
+org.eclipse.emf.ant.taskdefs.codegen
+org.eclipse.emf.ant.taskdefs.codegen.ecore
+org.eclipse.emf.ant.util
+org.eclipse.emf.codegen
+org.eclipse.emf.codegen.action
+org.eclipse.emf.codegen.ecore
+org.eclipse.emf.codegen.ecore.generator
+org.eclipse.emf.codegen.ecore.genmodel
+org.eclipse.emf.codegen.ecore.genmodel.action
+org.eclipse.emf.codegen.ecore.genmodel.generator
+org.eclipse.emf.codegen.ecore.genmodel.handler
+org.eclipse.emf.codegen.ecore.genmodel.impl
+org.eclipse.emf.codegen.ecore.genmodel.presentation
+org.eclipse.emf.codegen.ecore.genmodel.provider
+org.eclipse.emf.codegen.ecore.genmodel.util
+org.eclipse.emf.codegen.ecore.gwt
+org.eclipse.emf.codegen.ecore.templates.edit
+org.eclipse.emf.codegen.ecore.templates.editor
+org.eclipse.emf.codegen.ecore.templates.model
+org.eclipse.emf.codegen.ecore.templates.model.tests
+org.eclipse.emf.codegen.ecore.ui
+org.eclipse.emf.codegen.ecore.xtext
+org.eclipse.emf.codegen.ecore.xtext.ui
+org.eclipse.emf.codegen.jet
+org.eclipse.emf.codegen.jmerge
+org.eclipse.emf.codegen.merge.java
+org.eclipse.emf.codegen.merge.java.facade
+org.eclipse.emf.codegen.merge.java.facade.ast
+org.eclipse.emf.codegen.merge.java.facade.jdom
+org.eclipse.emf.codegen.merge.properties
+org.eclipse.emf.codegen.presentation
+org.eclipse.emf.codegen.util
+org.eclipse.emf.common
+org.eclipse.emf.common.archive
+org.eclipse.emf.common.command
+org.eclipse.emf.common.notify
+org.eclipse.emf.common.notify.impl
+org.eclipse.emf.common.ui
+org.eclipse.emf.common.ui.action
+org.eclipse.emf.common.ui.celleditor
+org.eclipse.emf.common.ui.dialogs
+org.eclipse.emf.common.ui.editor
+org.eclipse.emf.common.ui.viewer
+org.eclipse.emf.common.ui.wizard
+org.eclipse.emf.common.util
+org.eclipse.emf.converter
+org.eclipse.emf.converter.ui
+org.eclipse.emf.converter.ui.contribution
+org.eclipse.emf.converter.ui.contribution.base
+org.eclipse.emf.converter.util
+org.eclipse.emf.databinding
+org.eclipse.emf.databinding.edit
+org.eclipse.emf.databinding.edit.internal
+org.eclipse.emf.databinding.internal
+org.eclipse.emf.ecore
+org.eclipse.emf.ecore.action
+org.eclipse.emf.ecore.change
+org.eclipse.emf.ecore.change.impl
+org.eclipse.emf.ecore.change.provider
+org.eclipse.emf.ecore.change.util
+org.eclipse.emf.ecore.impl
+org.eclipse.emf.ecore.plugin
+org.eclipse.emf.ecore.presentation
+org.eclipse.emf.ecore.provider
+org.eclipse.emf.ecore.resource
+org.eclipse.emf.ecore.resource.impl
+org.eclipse.emf.ecore.util
+org.eclipse.emf.ecore.xcore
+org.eclipse.emf.ecore.xcore.conversion
+org.eclipse.emf.ecore.xcore.exporter
+org.eclipse.emf.ecore.xcore.exporter.ui
+org.eclipse.emf.ecore.xcore.findrefs
+org.eclipse.emf.ecore.xcore.formatting
+org.eclipse.emf.ecore.xcore.generator
+org.eclipse.emf.ecore.xcore.impl
+org.eclipse.emf.ecore.xcore.importer
+org.eclipse.emf.ecore.xcore.importer.ui
+org.eclipse.emf.ecore.xcore.interpreter
+org.eclipse.emf.ecore.xcore.lib
+org.eclipse.emf.ecore.xcore.mappings
+org.eclipse.emf.ecore.xcore.parser.antlr
+org.eclipse.emf.ecore.xcore.parser.antlr.internal
+org.eclipse.emf.ecore.xcore.provider
+org.eclipse.emf.ecore.xcore.resource
+org.eclipse.emf.ecore.xcore.resource.containers
+org.eclipse.emf.ecore.xcore.scoping
+org.eclipse.emf.ecore.xcore.scoping.types
+org.eclipse.emf.ecore.xcore.services
+org.eclipse.emf.ecore.xcore.ui
+org.eclipse.emf.ecore.xcore.ui.builder
+org.eclipse.emf.ecore.xcore.ui.container
+org.eclipse.emf.ecore.xcore.ui.contentassist
+org.eclipse.emf.ecore.xcore.ui.contentassist.antlr
+org.eclipse.emf.ecore.xcore.ui.contentassist.antlr.internal
+org.eclipse.emf.ecore.xcore.ui.editor
+org.eclipse.emf.ecore.xcore.ui.formatting
+org.eclipse.emf.ecore.xcore.ui.handler
+org.eclipse.emf.ecore.xcore.ui.hover
+org.eclipse.emf.ecore.xcore.ui.hyperlinking
+org.eclipse.emf.ecore.xcore.ui.internal
+org.eclipse.emf.ecore.xcore.ui.labeling
+org.eclipse.emf.ecore.xcore.ui.outline
+org.eclipse.emf.ecore.xcore.ui.quickfix
+org.eclipse.emf.ecore.xcore.ui.refactoring
+org.eclipse.emf.ecore.xcore.util
+org.eclipse.emf.ecore.xcore.validation
+org.eclipse.emf.ecore.xmi
+org.eclipse.emf.ecore.xmi.impl
+org.eclipse.emf.ecore.xmi.util
+org.eclipse.emf.ecore.xml.namespace
+org.eclipse.emf.ecore.xml.namespace.impl
+org.eclipse.emf.ecore.xml.namespace.util
+org.eclipse.emf.ecore.xml.type
+org.eclipse.emf.ecore.xml.type.impl
+org.eclipse.emf.ecore.xml.type.internal
+org.eclipse.emf.ecore.xml.type.util
+org.eclipse.emf.edit
+org.eclipse.emf.edit.command
+org.eclipse.emf.edit.domain
+org.eclipse.emf.edit.provider
+org.eclipse.emf.edit.provider.resource
+org.eclipse.emf.edit.tree
+org.eclipse.emf.edit.tree.impl
+org.eclipse.emf.edit.tree.provider
+org.eclipse.emf.edit.tree.util
+org.eclipse.emf.edit.ui
+org.eclipse.emf.edit.ui.action
+org.eclipse.emf.edit.ui.celleditor
+org.eclipse.emf.edit.ui.dnd
+org.eclipse.emf.edit.ui.provider
+org.eclipse.emf.edit.ui.util
+org.eclipse.emf.edit.ui.view
+org.eclipse.emf.examples.extlibrary
+org.eclipse.emf.examples.extlibrary.actions
+org.eclipse.emf.examples.extlibrary.impl
+org.eclipse.emf.examples.extlibrary.presentation
+org.eclipse.emf.examples.extlibrary.provider
+org.eclipse.emf.examples.extlibrary.util
+org.eclipse.emf.examples.generator.validator
+org.eclipse.emf.examples.generator.validator.templates.model
+org.eclipse.emf.exporter
+org.eclipse.emf.exporter.html
+org.eclipse.emf.exporter.html.ui
+org.eclipse.emf.exporter.ui
+org.eclipse.emf.exporter.ui.contribution
+org.eclipse.emf.exporter.ui.contribution.base
+org.eclipse.emf.exporter.util
+org.eclipse.emf.importer
+org.eclipse.emf.importer.ecore
+org.eclipse.emf.importer.ecore.taskdefs
+org.eclipse.emf.importer.ecore.ui
+org.eclipse.emf.importer.java
+org.eclipse.emf.importer.java.builder
+org.eclipse.emf.importer.java.taskdefs
+org.eclipse.emf.importer.java.ui
+org.eclipse.emf.importer.rose
+org.eclipse.emf.importer.rose.builder
+org.eclipse.emf.importer.rose.parser
+org.eclipse.emf.importer.rose.taskdefs
+org.eclipse.emf.importer.rose.ui
+org.eclipse.emf.importer.ui
+org.eclipse.emf.importer.ui.contribution
+org.eclipse.emf.importer.ui.contribution.base
+org.eclipse.emf.importer.util
+org.eclipse.emf.java
+org.eclipse.emf.java.impl
+org.eclipse.emf.java.presentation
+org.eclipse.emf.java.provider
+org.eclipse.emf.java.util
+org.eclipse.emf.mapping
+org.eclipse.emf.mapping.action
+org.eclipse.emf.mapping.command
+org.eclipse.emf.mapping.domain
+org.eclipse.emf.mapping.ecore2ecore
+org.eclipse.emf.mapping.ecore2ecore.action
+org.eclipse.emf.mapping.ecore2ecore.impl
+org.eclipse.emf.mapping.ecore2ecore.presentation
+org.eclipse.emf.mapping.ecore2ecore.provider
+org.eclipse.emf.mapping.ecore2ecore.util
+org.eclipse.emf.mapping.ecore2xml
+org.eclipse.emf.mapping.ecore2xml.action
+org.eclipse.emf.mapping.ecore2xml.impl
+org.eclipse.emf.mapping.ecore2xml.presentation
+org.eclipse.emf.mapping.ecore2xml.provider
+org.eclipse.emf.mapping.ecore2xml.ui
+org.eclipse.emf.mapping.ecore2xml.util
+org.eclipse.emf.mapping.impl
+org.eclipse.emf.mapping.presentation
+org.eclipse.emf.mapping.provider
+org.eclipse.emf.mapping.util
+org.eclipse.emf.oda.ecore
+org.eclipse.emf.oda.ecore.impl
+org.eclipse.emf.oda.ecore.ui
+org.eclipse.emf.oda.ecore.ui.impl
+org.eclipse.emf.oda.ecore.util
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/j2se5-package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/java/package-list
index 48783362..351c1868 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/j2se5-package-list
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/java/package-list
@@ -17,6 +17,7 @@ java.io
java.lang
java.lang.annotation
java.lang.instrument
+java.lang.invoke
java.lang.management
java.lang.ref
java.lang.reflect
@@ -27,6 +28,9 @@ java.nio.channels
java.nio.channels.spi
java.nio.charset
java.nio.charset.spi
+java.nio.file
+java.nio.file.attribute
+java.nio.file.spi
java.rmi
java.rmi.activation
java.rmi.dgc
@@ -39,17 +43,29 @@ java.security.interfaces
java.security.spec
java.sql
java.text
+java.text.spi
+java.time
+java.time.chrono
+java.time.format
+java.time.temporal
+java.time.zone
java.util
java.util.concurrent
java.util.concurrent.atomic
java.util.concurrent.locks
+java.util.function
java.util.jar
java.util.logging
java.util.prefs
java.util.regex
+java.util.spi
+java.util.stream
java.util.zip
javax.accessibility
+javax.activation
javax.activity
+javax.annotation
+javax.annotation.processing
javax.crypto
javax.crypto.interfaces
javax.crypto.spec
@@ -60,6 +76,12 @@ javax.imageio.plugins.bmp
javax.imageio.plugins.jpeg
javax.imageio.spi
javax.imageio.stream
+javax.jws
+javax.jws.soap
+javax.lang.model
+javax.lang.model.element
+javax.lang.model.type
+javax.lang.model.util
javax.management
javax.management.loading
javax.management.modelmbean
@@ -83,6 +105,7 @@ javax.print.event
javax.rmi
javax.rmi.CORBA
javax.rmi.ssl
+javax.script
javax.security.auth
javax.security.auth.callback
javax.security.auth.kerberos
@@ -108,6 +131,7 @@ javax.swing.plaf
javax.swing.plaf.basic
javax.swing.plaf.metal
javax.swing.plaf.multi
+javax.swing.plaf.nimbus
javax.swing.plaf.synth
javax.swing.table
javax.swing.text
@@ -116,17 +140,43 @@ javax.swing.text.html.parser
javax.swing.text.rtf
javax.swing.tree
javax.swing.undo
+javax.tools
javax.transaction
javax.transaction.xa
javax.xml
+javax.xml.bind
+javax.xml.bind.annotation
+javax.xml.bind.annotation.adapters
+javax.xml.bind.attachment
+javax.xml.bind.helpers
+javax.xml.bind.util
+javax.xml.crypto
+javax.xml.crypto.dom
+javax.xml.crypto.dsig
+javax.xml.crypto.dsig.dom
+javax.xml.crypto.dsig.keyinfo
+javax.xml.crypto.dsig.spec
javax.xml.datatype
javax.xml.namespace
javax.xml.parsers
+javax.xml.soap
+javax.xml.stream
+javax.xml.stream.events
+javax.xml.stream.util
javax.xml.transform
javax.xml.transform.dom
javax.xml.transform.sax
+javax.xml.transform.stax
javax.xml.transform.stream
javax.xml.validation
+javax.xml.ws
+javax.xml.ws.handler
+javax.xml.ws.handler.soap
+javax.xml.ws.http
+javax.xml.ws.soap
+javax.xml.ws.spi
+javax.xml.ws.spi.http
+javax.xml.ws.wsaddressing
javax.xml.xpath
org.ietf.jgss
org.omg.CORBA
@@ -161,6 +211,7 @@ org.w3c.dom
org.w3c.dom.bootstrap
org.w3c.dom.events
org.w3c.dom.ls
+org.w3c.dom.views
org.xml.sax
org.xml.sax.ext
org.xml.sax.helpers
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/osgi/package-list b/releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/osgi/package-list
new file mode 100644
index 00000000..a9f51638
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/package-lists/osgi/package-list
@@ -0,0 +1,13 @@
+org.osgi.framework
+org.osgi.framework.hooks.bundle
+org.osgi.framework.hooks.resolver
+org.osgi.framework.hooks.service
+org.osgi.framework.hooks.weaving
+org.osgi.framework.launch
+org.osgi.framework.startlevel
+org.osgi.framework.wiring
+org.osgi.service.condpermadmin
+org.osgi.service.packageadmin
+org.osgi.service.permissionadmin
+org.osgi.service.startlevel
+org.osgi.service.url
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
index 9d802078..78fa9bb3 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
@@ -28,10 +28,9 @@
<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>-linkoffline https://docs.oracle.com/javase/8/docs/api/ ${project.basedir}/package-lists/java</additionalArgument>
+ <additionalArgument>-linkoffline https://osgi.org/javadoc/r4v43/core/index.html ${project.basedir}/package-lists/osgi</additionalArgument>
+ <additionalArgument>-linkoffline http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/ ${project.basedir}/package-lists/emf</additionalArgument>
<additionalArgument>-public</additionalArgument>
</additionalArguments>
</javadocOptions>
@@ -41,5 +40,4 @@
</plugin>
</plugins>
</build>
-</project>
-
+</project> \ No newline at end of file

Back to the top