Skip to content

Commit

Permalink
8086: Some refactoring for jmc/core
Browse files Browse the repository at this point in the history
Reviewed-by: bdutheil, aptmac
  • Loading branch information
RealCLanger committed Jun 20, 2023
1 parent cedf50f commit cf2fe2b
Show file tree
Hide file tree
Showing 114 changed files with 66,512 additions and 862 deletions.
10 changes: 0 additions & 10 deletions application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,6 @@
<artifactId>common</artifactId>
<version>${revision}${changelist}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common.test</artifactId>
<version>${revision}${changelist}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder</artifactId>
Expand All @@ -172,11 +167,6 @@
<artifactId>jdp</artifactId>
<version>${revision}${changelist}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.test</artifactId>
<version>${revision}${changelist}</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
7 changes: 7 additions & 0 deletions application/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@
</build>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>testlib</artifactId>
<version>${revision}${changelist}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Bundle-Vendor: Oracle Corporation
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.junit,
org.eclipse.swt,
org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.ui.forms,
org.openjdk.jmc.flightrecorder,
org.openjdk.jmc.testlib,
org.openjdk.jmc.rjmx,
org.openjdk.jmc.rjmx.ui,
org.eclipse.ui,
org.openjdk.jmc.flightrecorder,
org.adoptopenjdk.jemmy-awt-input,
org.adoptopenjdk.jemmy-browser,
org.adoptopenjdk.jemmy-core,
Expand Down
28 changes: 0 additions & 28 deletions application/uitests/org.openjdk.jmc.test.jemmy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,6 @@
<spotless.config.path>${basedir}/../../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
</properties>

<dependencies>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common</artifactId>
<version>${revision}${changelist}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common.test</artifactId>
<version>${revision}${changelist}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder</artifactId>
<version>${revision}${changelist}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.rules</artifactId>
<version>${revision}${changelist}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.rules.jdk</artifactId>
<version>${revision}${changelist}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
35 changes: 2 additions & 33 deletions application/uitests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<test.excludes.default>**/*$*</test.excludes.default>
<ui.test.excludes>**/uitest/**,${test.excludes.default}</ui.test.excludes>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.version>${revision}${changelist}</jmc.version>
</properties>

<modules>
Expand All @@ -65,38 +64,8 @@
<dependencies>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common</artifactId>
<version>${jmc.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common.test</artifactId>
<version>${jmc.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder</artifactId>
<version>${jmc.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.rules</artifactId>
<version>${jmc.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.rules.jdk</artifactId>
<version>${jmc.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.serializers</artifactId>
<version>${jmc.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.writer</artifactId>
<version>${jmc.version}</version>
<artifactId>testlib</artifactId>
<version>${revision}${changelist}</version>
</dependency>
</dependencies>
<profiles>
Expand Down
14 changes: 8 additions & 6 deletions core/coverage/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2021, Red Hat Inc. All rights reserved.
Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2023, Red Hat Inc. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -42,11 +42,9 @@
<artifactId>coverage.core</artifactId>
<name>Code coverage report jmc/core</name>
<packaging>pom</packaging>

<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>

<dependencies>
<!-- First all the modules in core/ -->
<dependency>
Expand Down Expand Up @@ -84,11 +82,15 @@
<artifactId>jdp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>testlib</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Second all the modules in core/tests/ -->
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common.test</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions core/org.openjdk.jmc.common/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -40,7 +40,7 @@
</parent>
<artifactId>common</artifactId>
<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>
<dependencies>
<dependency>
Expand Down
9 changes: 2 additions & 7 deletions core/org.openjdk.jmc.flightrecorder.rules.jdk/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -40,14 +40,9 @@
</parent>
<artifactId>flightrecorder.rules.jdk</artifactId>
<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>
<dependencies>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions core/org.openjdk.jmc.flightrecorder.rules/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -40,7 +40,7 @@
</parent>
<artifactId>flightrecorder.rules</artifactId>
<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>
<dependencies>
<dependency>
Expand Down
16 changes: 3 additions & 13 deletions core/org.openjdk.jmc.flightrecorder.serializers/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, 2022, Datadog, Inc. All rights reserved.
Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, 2023, Datadog, Inc. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -41,23 +41,13 @@
</parent>
<artifactId>flightrecorder.serializers</artifactId>
<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>
<dependencies>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions core/org.openjdk.jmc.flightrecorder.writer/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, 2022, Datadog, Inc. All rights reserved.
Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, 2023, Datadog, Inc. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -41,7 +41,7 @@
</parent>
<artifactId>flightrecorder.writer</artifactId>
<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions core/org.openjdk.jmc.flightrecorder/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -40,7 +40,7 @@
</parent>
<artifactId>flightrecorder</artifactId>
<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions core/org.openjdk.jmc.jdp/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -40,6 +40,6 @@
</parent>
<artifactId>jdp</artifactId>
<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>
</project>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ Bundle-SymbolicName: org.openjdk.jmc.testlib;singleton:=true
Bundle-Version: 9.0.0.qualifier
Bundle-Vendor: Oracle Corporation
Bundle-ActivationPolicy: lazy
Require-Bundle: org.openjdk.jmc.common,
org.junit
Require-Bundle: org.junit,
org.openjdk.jmc.common;visibility:=reexport,
org.openjdk.jmc.flightrecorder
Export-Package: org.openjdk.jmc.test,
org.openjdk.jmc.test.io,
org.openjdk.jmc.test.mock.item
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -35,23 +35,27 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openjdk.jmc</groupId>
<artifactId>missioncontrol.core.tests</artifactId>
<artifactId>missioncontrol.core</artifactId>
<version>${revision}${changelist}</version>
</parent>
<artifactId>testlib</artifactId>
<properties>
<fail.if.no.tests>false</fail.if.no.tests>
<spotless.config.path>${basedir}/../../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>