Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/license/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Oracle provides this software under a dual license, either the UPL or the BSD:

Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.

The Universal Permissive License (UPL), Version 1.0

Expand Down Expand Up @@ -40,7 +40,7 @@ SOFTWARE.

The BSD 3-Clause License (BSD):

Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion core/license/THIRD_PARTY_LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

===============================================================================
## org.lz4:lz4-java@1.8.0 (Apache-2.0)
## at.yawk.lz4:lz4-java@1.10.2 (Apache-2.0)

URL for License – http://opensource.org/licenses/Apache-2.0

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
Expand Up @@ -49,9 +49,9 @@
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>org.lz4</groupId>
<groupId>at.yawk.lz4</groupId>
<artifactId>lz4-java</artifactId>
<version>1.8.0</version>
<version>1.10.2</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions license/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.

The Universal Permissive License (UPL), Version 1.0

Expand Down Expand Up @@ -36,7 +36,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


Copyright (c) 2018, 2024, Oracle America, Inc. All rights reserved.
Copyright (c) 2018, 2026, Oracle America, Inc. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Expand Down
4 changes: 2 additions & 2 deletions license/THIRDPARTYREADME.txt
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ the Author.
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.

%% The following notice is provided with respect to lz4-java v1.8.0,
%% The following notice is provided with respect to lz4-java v1.10.2,
which may be included with this product.

URL for License � http://opensource.org/licenses/Apache-2.0
Expand Down Expand Up @@ -3036,7 +3036,7 @@ SOFTWARE.

-------------------------------------------------------------------------------------------

%% The following notice is provided with respect to Angus Mail v2.0.3,
%% The following notice is provided with respect to Angus Mail v2.0.5,
which may be included with this product.

# Eclipse Public License - v 2.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DD year update as well

Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -36,10 +36,10 @@
<target name="jmc-target-2024-06" sequenceNumber="47">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.3"/>
<unit id="angus-activation" version="2.0.2"/>
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.5"/>
<unit id="angus-activation" version="2.0.3"/>
<unit id="org.owasp.encoder" version="1.2.3"/>
<unit id="lz4-java" version="1.8.0"/>
<unit id="lz4-java" version="1.10.2"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.2.2"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the DD one too

Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -36,10 +36,10 @@
<target name="jmc-target-2024-09" sequenceNumber="47">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.3"/>
<unit id="angus-activation" version="2.0.2"/>
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.5"/>
<unit id="angus-activation" version="2.0.3"/>
<unit id="org.owasp.encoder" version="1.2.3"/>
<unit id="lz4-java" version="1.8.0"/>
<unit id="lz4-java" version="1.10.2"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.2.2"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will need to update the DD one below as well

Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -36,10 +36,10 @@
<target name="jmc-target-2024-12" sequenceNumber="47">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.3"/>
<unit id="angus-activation" version="2.0.2"/>
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.5"/>
<unit id="angus-activation" version="2.0.3"/>
<unit id="org.owasp.encoder" version="1.2.3"/>
<unit id="lz4-java" version="1.8.0"/>
<unit id="lz4-java" version="1.10.2"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.2.2"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2025, Datadog, Inc. All rights reserved.
Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2025, 2026


DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

Expand Down Expand Up @@ -36,10 +36,10 @@
<target name="jmc-target-2025-03" sequenceNumber="47">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.3"/>
<unit id="angus-activation" version="2.0.2"/>
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.5"/>
<unit id="angus-activation" version="2.0.3"/>
<unit id="org.owasp.encoder" version="1.2.3"/>
<unit id="lz4-java" version="1.8.0"/>
<unit id="lz4-java" version="1.10.2"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.2.2"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2025, 2026 for both

Copyright (c) 2025, Datadog, Inc. All rights reserved.

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -36,10 +36,10 @@
<target name="jmc-target-2025-06" sequenceNumber="47">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.3"/>
<unit id="angus-activation" version="2.0.2"/>
<unit id="org.eclipse.angus.jakarta.mail" version="2.0.5"/>
<unit id="angus-activation" version="2.0.3"/>
<unit id="org.owasp.encoder" version="1.2.3"/>
<unit id="lz4-java" version="1.8.0"/>
<unit id="lz4-java" version="1.10.2"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.2.2"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2025, Datadog, Inc. All rights reserved.
Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

er, these should be 2025, 2026 for both

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down
14 changes: 7 additions & 7 deletions releng/third-party/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, 2025, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

Expand Down Expand Up @@ -38,7 +38,7 @@
<groupId>org.openjdk.jmc</groupId>
<artifactId>external-dependencies</artifactId>
<packaging>war</packaging>
<version>9.1.1-SNAPSHOT</version>
<version>9.1.2-SNAPSHOT</version>

<properties>
<!-- Config -->
Expand All @@ -51,12 +51,12 @@
<jetty-maven-plugin.version>11.0.15</jetty-maven-plugin.version>
<maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version>
<!-- Versions -->
<jakarta.mail.version>2.0.3</jakarta.mail.version>
<angus.activation.version>2.0.2</angus.activation.version>
<jakarta.activation.version>2.1.3</jakarta.activation.version>
<jakarta.mail.version>2.0.5</jakarta.mail.version>
<angus.activation.version>2.0.3</angus.activation.version>
<jakarta.activation.version>2.1.4</jakarta.activation.version>
<osgi-resource-locator.version>1.0.3</osgi-resource-locator.version>
<owasp.encoder.version>1.2.3</owasp.encoder.version>
<lz4.version>1.8.0</lz4.version>
<lz4.version>1.10.2</lz4.version>
<hdrhistogram.version>2.2.2</hdrhistogram.version>
<jemmy.version>2.0.0</jemmy.version>
<jetty.version>12.0.21</jetty.version>
Expand Down Expand Up @@ -104,7 +104,7 @@
<id>org.owasp.encoder:encoder:${owasp.encoder.version}</id>
</artifact>
<artifact>
<id>org.lz4:lz4-java:${lz4.version}</id>
<id>at.yawk.lz4:lz4-java:${lz4.version}</id>
</artifact>
<artifact>
<id>org.hdrhistogram:HdrHistogram:${hdrhistogram.version}</id>
Expand Down