7512: Update lz4-java and remove the osgi bundle name override

Reviewed-by: hirt
openjdk · Jan 28, 2022 · 9ec05b3 · 9ec05b3
1 parent 2f79156
commit 9ec05b3
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 15 deletions.
diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
@@ -84,7 +84,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.lz4.lz4-java"
+         id="lz4-java"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
@@ -137,7 +137,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.lz4.lz4-java"
+         id="lz4-java"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/core/license/THIRD_PARTY_LICENSES.txt b/core/license/THIRD_PARTY_LICENSES.txt
@@ -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.7.1 (Apache-2.0)
+## org.lz4:lz4-java@1.8.0 (Apache-2.0)
 
                                 URL for License – http://opensource.org/licenses/Apache-2.0
 

diff --git a/core/org.openjdk.jmc.common/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.common/META-INF/MANIFEST.MF
@@ -13,4 +13,4 @@ Export-Package: org.openjdk.jmc.common,
  org.openjdk.jmc.common.util,
  org.openjdk.jmc.common.version
 Automatic-Module-Name: org.openjdk.jmc.common
-Require-Bundle: org.owasp.encoder, org.lz4.lz4-java
+Require-Bundle: org.owasp.encoder, lz4-java
diff --git a/core/org.openjdk.jmc.common/pom.xml b/core/org.openjdk.jmc.common/pom.xml
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.lz4</groupId>
 			<artifactId>lz4-java</artifactId>
-			<version>1.7.1</version>
+			<version>1.8.0</version>
 		</dependency>
 	</dependencies>
 	<properties>

diff --git a/core/org.openjdk.jmc.flightrecorder.serializers/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.flightrecorder.serializers/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Export-Package: org.openjdk.jmc.flightrecorder.serializers,
  org.openjdk.jmc.flightrecorder.serializers.json,
  org.openjdk.jmc.flightrecorder.serializers.dot
 Automatic-Module-Name: org.openjdk.jmc.flightrecorder.serializers
-Require-Bundle: org.lz4.lz4-java, org.openjdk.jmc.flightrecorder
+Require-Bundle: lz4-java, org.openjdk.jmc.flightrecorder
diff --git a/core/tests/org.openjdk.jmc.flightrecorder.writer.test/license/THIRD_PARTY_LICENSES.txt b/core/tests/org.openjdk.jmc.flightrecorder.writer.test/license/THIRD_PARTY_LICENSES.txt
@@ -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.7.1 (Apache-2.0)
+## org.lz4:lz4-java@1.8.0 (Apache-2.0)
 
                                 URL for License – http://opensource.org/licenses/Apache-2.0
 

diff --git a/releng/platform-definitions/platform-definition-2021-06/platform-definition-2021-06.target b/releng/platform-definitions/platform-definition-2021-06/platform-definition-2021-06.target
@@ -39,7 +39,7 @@
             <unit id="com.sun.mail.jakarta.mail" version="2.0.1"/>
             <unit id="com.sun.activation.jakarta.activation" version="2.0.1"/>
             <unit id="org.owasp.encoder" version="1.2.3"/>
-            <unit id="org.lz4.lz4-java" version="1.8.0"/>
+            <unit id="lz4-java" version="1.8.0"/>
             <unit id="org.hdrhistogram.HdrHistogram" version="2.1.12"/>
             <unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>

diff --git a/releng/platform-definitions/platform-definition-2021-09/platform-definition-2021-09.target b/releng/platform-definitions/platform-definition-2021-09/platform-definition-2021-09.target
@@ -39,7 +39,7 @@
             <unit id="com.sun.mail.jakarta.mail" version="2.0.1"/>
             <unit id="com.sun.activation.jakarta.activation" version="2.0.1"/>
             <unit id="org.owasp.encoder" version="1.2.3"/>
-            <unit id="org.lz4.lz4-java" version="1.8.0"/>
+            <unit id="lz4-java" version="1.8.0"/>
             <unit id="org.hdrhistogram.HdrHistogram" version="2.1.12"/>
             <unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>

diff --git a/releng/platform-definitions/platform-definition-2021-12/platform-definition-2021-12.target b/releng/platform-definitions/platform-definition-2021-12/platform-definition-2021-12.target
@@ -39,7 +39,7 @@
             <unit id="com.sun.mail.jakarta.mail" version="2.0.1"/>
             <unit id="com.sun.activation.jakarta.activation" version="2.0.1"/>
             <unit id="org.owasp.encoder" version="1.2.3"/>
-            <unit id="org.lz4.lz4-java" version="1.8.0"/>
+            <unit id="lz4-java" version="1.8.0"/>
             <unit id="org.hdrhistogram.HdrHistogram" version="2.1.12"/>
             <unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>

diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml
@@ -87,11 +87,6 @@
 								</artifact>
 								<artifact>
 									<id>org.lz4:lz4-java:${lz4.version}</id>
-									<override>true</override>
-									<instructions>
-										<Bundle-Name>org.lz4.lz4-java</Bundle-Name>
-										<Bundle-SymbolicName>org.lz4.lz4-java</Bundle-SymbolicName>
-									</instructions>
 								</artifact>
 								<artifact>
 									<id>org.hdrhistogram:HdrHistogram:${hdrhistogram.version}</id>