--- old/README.md 2018-08-13 22:12:58.000000000 +0200
+++ new/README.md 2018-08-13 22:12:58.000000000 +0200
@@ -229,15 +229,6 @@
To run the UI tests:
-> Currently, in order to run UI tests you need to supply the Jemmy UI testing libraries yourself. These can be built from source available at the mercurial repository at http://hg.openjdk.java.net/code-tools/jemmy/v3/.
-
->1. Create a directory on your local drive where you wish to build the Jemmy libraries.
->2. In a terminal, when in the newly created directory, issue `hg clone http://hg.openjdk.java.net/code-tools/jemmy/v3/`. If you don't have a Mercurial client you can download the code from http://hg.openjdk.java.net/code-tools/jemmy/v3/archive/tip.zip (or .gz or .bz2).
->3. Build Jemmy by issuing `mvn clean package`. Adding `-DskipTests` makes sure that UI tests that might fail won't stop the packaging.
->4. Copy the resulting jar files from core/JemmyCore/target, core/JemmyAWTInput/target, core/JemmyBrowser/target and SWT/JemmySWT/target to \[jmc_repo_dir\]/application/uitests/org.openjdk.jmc.test.jemmy/lib/ (create the lib directory first if it does not exist).
-
->(As soon as Jemmy is published on Maven Central, this manual build step will be removed.)
-
```bash
mvn verify -P uitests
```
--- old/application/uitests/org.openjdk.jmc.test.jemmy/.classpath 2018-08-13 22:12:59.000000000 +0200
+++ new/application/uitests/org.openjdk.jmc.test.jemmy/.classpath 2018-08-13 22:12:58.000000000 +0200
@@ -3,11 +3,8 @@
-
-
-
-
-
+
+
--- old/application/uitests/org.openjdk.jmc.test.jemmy/.settings/org.eclipse.jdt.core.prefs 2018-08-13 22:12:59.000000000 +0200
+++ new/application/uitests/org.openjdk.jmc.test.jemmy/.settings/org.eclipse.jdt.core.prefs 2018-08-13 22:12:59.000000000 +0200
@@ -1,2 +1,106 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.8
--- old/application/uitests/org.openjdk.jmc.test.jemmy/META-INF/MANIFEST.MF 2018-08-13 22:13:00.000000000 +0200
+++ new/application/uitests/org.openjdk.jmc.test.jemmy/META-INF/MANIFEST.MF 2018-08-13 22:13:00.000000000 +0200
@@ -13,12 +13,12 @@
org.openjdk.jmc.rjmx,
org.openjdk.jmc.rjmx.ui,
org.eclipse.ui,
- org.openjdk.jmc.flightrecorder
-Bundle-ClassPath: .,
- lib/JemmyCore-1.0.jar,
- lib/JemmySWT-1.0.jar,
- lib/JemmyAWTInput-1.0.jar,
- lib/JemmyBrowser-1.0.jar
+ org.openjdk.jmc.flightrecorder,
+ org.adoptopenjdk.jemmy-awt-input,
+ org.adoptopenjdk.jemmy-browser,
+ org.adoptopenjdk.jemmy-core,
+ org.adoptopenjdk.jemmy-swt
+Bundle-ClassPath: .
Import-Package: org.openjdk.jmc.alert,
org.openjdk.jmc.browser.attach,
org.openjdk.jmc.browser.views,
--- old/application/uitests/org.openjdk.jmc.test.jemmy/build.properties 2018-08-13 22:13:01.000000000 +0200
+++ new/application/uitests/org.openjdk.jmc.test.jemmy/build.properties 2018-08-13 22:13:00.000000000 +0200
@@ -35,6 +35,5 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- lib/,\
appicons/
pde.match.rule.bundle=compatible
--- old/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml 2018-08-13 22:13:01.000000000 +0200
+++ new/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml 2018-08-13 22:13:01.000000000 +0200
@@ -1,37 +1,30 @@
-
-
+
+
4.0.0
org.openjdk.jmc
--- old/releng/platform-definitions/platform-definition-oxygen/platform-definition-oxygen.target 2018-08-13 22:13:02.000000000 +0200
+++ new/releng/platform-definitions/platform-definition-oxygen/platform-definition-oxygen.target 2018-08-13 22:13:02.000000000 +0200
@@ -1,5 +1,4 @@
-
-
-
+-->
@@ -41,6 +39,10 @@
+
+
+
+
@@ -56,4 +58,4 @@
-
+
\ No newline at end of file
--- old/releng/platform-definitions/platform-definition-photon/platform-definition-photon.target 2018-08-13 22:13:03.000000000 +0200
+++ new/releng/platform-definitions/platform-definition-photon/platform-definition-photon.target 2018-08-13 22:13:02.000000000 +0200
@@ -41,6 +41,10 @@
+
+
+
+
--- old/releng/third-party/pom.xml 2018-08-13 22:13:03.000000000 +0200
+++ new/releng/third-party/pom.xml 2018-08-13 22:13:03.000000000 +0200
@@ -42,7 +42,7 @@
org.reficio
p2-maven-plugin
- 1.2.0-SNAPSHOT
+ 1.3.0
default-cli
@@ -78,6 +78,18 @@
org.owasp.encoder:encoder:1.2.1
+
+ org.adoptopenjdk:jemmy-awt-input:1.0.2
+
+
+ org.adoptopenjdk:jemmy-browser:1.0.2
+
+
+ org.adoptopenjdk:jemmy-core:1.0.2
+
+
+ org.adoptopenjdk:jemmy-swt:1.0.2
+
--- /dev/null 2018-08-13 22:13:04.000000000 +0200
+++ new/application/org.openjdk.jmc.feature.jemmy/.project 2018-08-13 22:13:04.000000000 +0200
@@ -0,0 +1,23 @@
+
+
+ org.openjdk.jmc.feature.jemmy
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.m2e.core.maven2Nature
+ org.eclipse.pde.FeatureNature
+
+
--- /dev/null 2018-08-13 22:13:04.000000000 +0200
+++ new/application/org.openjdk.jmc.feature.jemmy/build.properties 2018-08-13 22:13:04.000000000 +0200
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The contents of this file are subject to the terms of either the Universal Permissive License
+# v 1.0 as shown at http://oss.oracle.com/licenses/upl
+#
+# or the following license:
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of conditions
+# and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+# conditions and the following disclaimer in the documentation and/or other materials provided with
+# the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used to
+# endorse or promote products derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+# WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+bin.includes = feature.xml,\
+ feature.properties,\
+ build.properties
+pde.match.rule.feature=compatible
+pde.match.rule.bundle=compatible
--- /dev/null 2018-08-13 22:13:05.000000000 +0200
+++ new/application/org.openjdk.jmc.feature.jemmy/feature.properties 2018-08-13 22:13:05.000000000 +0200
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The contents of this file are subject to the terms of either the Universal Permissive License
+# v 1.0 as shown at http://oss.oracle.com/licenses/upl
+#
+# or the following license:
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of conditions
+# and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+# conditions and the following disclaimer in the documentation and/or other materials provided with
+# the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used to
+# endorse or promote products derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+# WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+name=JDK Mission Control Console
+provider=Oracle Corporation
+copyright=Copyright \u00A9 2018, Oracle and/or its affiliates. All rights reserved.
+description=The JDK Mission Control Console feature contains all the Console related plug-ins.
+descriptionUrl=http://www.oracle.com/missioncontrol
--- /dev/null 2018-08-13 22:13:06.000000000 +0200
+++ new/application/org.openjdk.jmc.feature.jemmy/feature.xml 2018-08-13 22:13:05.000000000 +0200
@@ -0,0 +1,78 @@
+
+
+
+
+
+ %description
+
+
+
+ %copyright
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null 2018-08-13 22:13:06.000000000 +0200
+++ new/application/org.openjdk.jmc.feature.jemmy/pom.xml 2018-08-13 22:13:06.000000000 +0200
@@ -0,0 +1,43 @@
+
+
+
+ 4.0.0
+
+ org.openjdk.jmc
+ missioncontrol.application
+ 7.0.0-SNAPSHOT
+
+ org.openjdk.jmc.feature.jemmy
+ eclipse-feature
+
--- /dev/null 2018-08-13 22:13:07.000000000 +0200
+++ new/application/uitests/org.openjdk.jmc.test.jemmy/.settings/org.eclipse.core.resources.prefs 2018-08-13 22:13:06.000000000 +0200
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/=UTF-8