Update versions

Update jffi to 1.3.13. Update jnr-ffi 2.2.16. Update jnr-enxio to 0.32.17. Update jnr-posix to 3.1.19. Update jnr-unixsocket to 0.38.22.
eclipse-orbit · Feb 15, 2024 · a06f04a · a06f04a
1 parent 50eac50
commit a06f04a
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 31 deletions.
diff --git a/...eclipse.orbit.maven.bnd.generator/src/org/eclipse/orbit/maven/bnd/generator/Analyzer.java b/...eclipse.orbit.maven.bnd.generator/src/org/eclipse/orbit/maven/bnd/generator/Analyzer.java
@@ -178,11 +178,11 @@ private String visitLocation(String location) {
 
 		featureMatcher.appendReplacement(result, Matcher.quoteReplacement(visitFeature(location, feature, featureID)));
 		featureMatcher.appendTail(result);
-		
-		if (!version.contains("(")) {  // )
+
+		if (version.contains("(")) { // )
 			return result.toString();
 		}
-		
+
 		return visitDependencies(result.toString(), featureID);
 	}
 

diff --git a/maven-osgi/tp/Maven.target b/maven-osgi/tp/Maven.target
@@ -3,7 +3,7 @@
 <target name="Maven" sequenceNumber="1">
   <locations>
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
-      <feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.31.0.v20240201-0858">
+      <feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.31.0.v20240215-1615">
         <description>This feature's dependencies are pulled directly from Maven central.</description>
         <copyright>
 Copyright (c) 2024 Eclipse contributors and others.
@@ -16,7 +16,7 @@ https://www.eclipse.org/legal/epl-2.0/
 SPDX-License-Identifier: EPL-2.0
         </copyright>
         <license url="https://www.eclipse.org/legal/epl-2.0/"/>
-        <!-- SHA1 d8cd821d6b36f7198547be1c26828f898919c4f9 -->
+        <!-- SHA1 094e35126c143f594495a5952a8e6192bcab1c7d -->
       </feature>
       <dependencies>
         <dependency>
@@ -172,7 +172,7 @@ SPDX-License-Identifier: EPL-2.0
         <dependency>
           <groupId>com.github.jnr</groupId>
           <artifactId>jffi</artifactId>
-          <version>1.3.12</version>
+          <version>1.3.13</version>
           <type>jar</type>
           <classifier>complete</classifier>
         </dependency>
@@ -185,25 +185,25 @@ SPDX-License-Identifier: EPL-2.0
         <dependency>
           <groupId>com.github.jnr</groupId>
           <artifactId>jnr-enxio</artifactId>
-          <version>0.32.16</version>
+          <version>0.32.17</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>com.github.jnr</groupId>
           <artifactId>jnr-ffi</artifactId>
-          <version>2.2.15</version>
+          <version>2.2.16</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>com.github.jnr</groupId>
           <artifactId>jnr-posix</artifactId>
-          <version>3.1.18</version>
+          <version>3.1.19</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>com.github.jnr</groupId>
           <artifactId>jnr-unixsocket</artifactId>
-          <version>0.38.21</version>
+          <version>0.38.22</version>
           <type>jar</type>
         </dependency>
         <dependency>

diff --git a/maven-sign/tp/MavenSign.target b/maven-sign/tp/MavenSign.target
@@ -6,7 +6,7 @@
 <!-- _______________________________________________________ com.github.jnr.jffi _________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
-      <feature id="org.eclipse.orbit.maven.com.github.jnr.jffi" label="Orbit Maven BND com.github.jnr.jffi" provider-name="Eclipse Orbit" version="4.31.0">
+      <feature id="org.eclipse.orbit.maven.com.github.jnr.jffi" label="Orbit Maven BND com.github.jnr.jffi" provider-name="Eclipse Orbit" version="4.31.0.v20240215-1616">
         <description>This feature's dependencies are pulled directly from Maven central and is signed.</description>
         <copyright>
 Copyright (c) 2024 Eclipse contributors and others.
@@ -24,19 +24,19 @@ SPDX-License-Identifier: EPL-2.0
         <dependency>
           <groupId>com.github.jnr</groupId>
           <artifactId>jffi</artifactId>
-          <version>1.3.12</version>
+          <version>1.3.13</version>
           <type>jar</type>
           <classifier>native</classifier>
         </dependency>
       </dependencies>
       <instructions>
-<!-- SHA1 2981a44ae70cde5b3a21962c51469aa8bdc5d62a -->
+<!-- SHA1 d3553655354248d7ad49484f0ca52bf00cbce2be -->
 <![CDATA[
 # These instructions are not actually used because this is an OSGi artifact
 version:                ${versionmask;===;${version_cleanup;${mvnVersion}}}
 # Bundles that match this pattern will be updated to use this qualifier.
 # bundle-pattern:       com\.github\.jnr\.jffi\.native(\.source)?
-Bundle-Version:         ${version}.v20230912-1130
+Bundle-Version:         ${version}.v20240215-1616
 ]]>
       </instructions>
     </location>
@@ -84,7 +84,7 @@ Bundle-Version:         ${version}.v20231211-1200
 <!-- _______________________________________________________ EXCLUDE _________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
-      <feature id="org.eclipse.orbit.maven.com.exclude" label="Orbit Maven BND exclude" provider-name="Eclipse Orbit" version="4.31.0">
+      <feature id="org.eclipse.orbit.maven.com.exclude" label="Orbit Maven BND exclude" provider-name="Eclipse Orbit" version="4.31.0.v20240215-1616">
         <description>This feature's dependencies are pulled directly from Maven central and is signed.</description>
         <copyright>
 Copyright (c) 2024 Eclipse contributors and others.
@@ -102,18 +102,18 @@ SPDX-License-Identifier: EPL-2.0
         <dependency>
           <groupId>com.github.jnr</groupId>
           <artifactId>jffi</artifactId>
-          <version>1.3.12</version>
+          <version>1.3.13</version>
           <type>jar</type>
           <classifier>complete</classifier>
         </dependency>
       </dependencies>
       <instructions>
-<!-- SHA1 91b325697e786740379351de7bc40bb9afe9c151 -->
+<!-- SHA1 fac9b43a86f37333d0f077673ee136caf544fcf8 -->
 <![CDATA[
 Bundle-Name:            Bundle ${mvnGroupId} : ${mvnArtifactId}
 version:                ${versionmask;===;${version_cleanup;${mvnVersion}}}
 Bundle-SymbolicName:    org.${mvnArtifactId}
-Bundle-Version:         ${version}.v20230912-1130
+Bundle-Version:         ${version}.v20240215-1616
 Eclipse-Wrapped-Bundle: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 Import-Package:         *
 Export-Package:         *;version="${version}";-noimport:=true

diff --git a/report/maven-osgi/linuxtools/REPORT.md b/report/maven-osgi/linuxtools/REPORT.md
@@ -1,5 +1,13 @@
 # Target Platform: [linuxtools](https://raw.githubusercontent.com/eclipse-linuxtools/org.eclipse.linuxtools/master/releng/org.eclipse.linuxtools.target/linuxtools-e4.31.target)
 
+## Minor Updates
+ - [com.github.jnr](https://repo1.maven.org/maven2/com/github/jnr/)
+    - [jffi](https://repo1.maven.org/maven2/com/github/jnr/jffi/) **[1.3.12](https://repo1.maven.org/maven2/com/github/jnr/jffi/1.3.12)** < [1.3.13](https://repo1.maven.org/maven2/com/github/jnr/jffi/1.3.13/)
+    - [jnr-enxio](https://repo1.maven.org/maven2/com/github/jnr/jnr-enxio/) **[0.32.16](https://repo1.maven.org/maven2/com/github/jnr/jnr-enxio/0.32.16)** < [0.32.17](https://repo1.maven.org/maven2/com/github/jnr/jnr-enxio/0.32.17/)
+    - [jnr-ffi](https://repo1.maven.org/maven2/com/github/jnr/jnr-ffi/) **[2.2.15](https://repo1.maven.org/maven2/com/github/jnr/jnr-ffi/2.2.15)** < [2.2.16](https://repo1.maven.org/maven2/com/github/jnr/jnr-ffi/2.2.16/)
+    - [jnr-posix](https://repo1.maven.org/maven2/com/github/jnr/jnr-posix/) **[3.1.18](https://repo1.maven.org/maven2/com/github/jnr/jnr-posix/3.1.18)** < [3.1.19](https://repo1.maven.org/maven2/com/github/jnr/jnr-posix/3.1.19/)
+    - [jnr-unixsocket](https://repo1.maven.org/maven2/com/github/jnr/jnr-unixsocket/) **[0.38.21](https://repo1.maven.org/maven2/com/github/jnr/jnr-unixsocket/0.38.21)** < [0.38.22](https://repo1.maven.org/maven2/com/github/jnr/jnr-unixsocket/0.38.22/)
+
 ## Major Updates
  - [jakarta.ws.rs](https://repo1.maven.org/maven2/jakarta/ws/rs/)
     - [jakarta.ws.rs-api](https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api/) **[2.1.6](https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api/2.1.6)** < [3.1.0](https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api/3.1.0/)
@@ -28,6 +36,9 @@
  - [org.mandas](https://repo1.maven.org/maven2/org/mandas/)
     - [docker-client](https://repo1.maven.org/maven2/org/mandas/docker-client/) **[5.2.2](https://repo1.maven.org/maven2/org/mandas/docker-client/5.2.2)** < [7.0.7](https://repo1.maven.org/maven2/org/mandas/docker-client/7.0.7/)
 
+## Updates Applied
+[updated.target](updated.target)
+
 ## Content
  - [com.fasterxml.jackson.core](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/)
     - [jackson-annotations](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/) **[2.16.1](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.16.1)**

diff --git a/report/maven-osgi/linuxtools/original.target b/report/maven-osgi/linuxtools/original.target
@@ -60,7 +60,7 @@
 <unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.lsp4e" version="0.0.0"/>
 <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/2023-12/"/>
+<repository location="https://download.eclipse.org/releases/2024-03/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>

diff --git a/report/maven-osgi/linuxtools/updated.target b/report/maven-osgi/linuxtools/updated.target
@@ -60,7 +60,7 @@
 <unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.lsp4e" version="0.0.0"/>
 <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/2023-12/"/>
+<repository location="https://download.eclipse.org/releases/2024-03/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
@@ -119,7 +119,7 @@
 			<dependency>
 				<groupId>com.github.jnr</groupId>
 				<artifactId>jffi</artifactId>
-				<version>1.3.12</version>
+				<version>1.3.13</version>
 				<type>jar</type>
 				<classifier>complete</classifier>
 			</dependency>
@@ -132,25 +132,25 @@
 			<dependency>
 				<groupId>com.github.jnr</groupId>
 				<artifactId>jnr-enxio</artifactId>
-				<version>0.32.16</version>
+				<version>0.32.17</version>
 				<type>jar</type>
 			</dependency>
 			<dependency>
 				<groupId>com.github.jnr</groupId>
 				<artifactId>jnr-ffi</artifactId>
-				<version>2.2.15</version>
+				<version>2.2.16</version>
 				<type>jar</type>
 			</dependency>
 			<dependency>
 				<groupId>com.github.jnr</groupId>
 				<artifactId>jnr-posix</artifactId>
-				<version>3.1.18</version>
+				<version>3.1.19</version>
 				<type>jar</type>
 			</dependency>
 			<dependency>
 				<groupId>com.github.jnr</groupId>
 				<artifactId>jnr-unixsocket</artifactId>
-				<version>0.38.21</version>
+				<version>0.38.22</version>
 				<type>jar</type>
 			</dependency>
 			<dependency>

diff --git a/report/maven-osgi/merged-target/REPORT.md b/report/maven-osgi/merged-target/REPORT.md
@@ -84,12 +84,12 @@
  - [com.github.ben-manes.caffeine](https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/)
     - [caffeine](https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/) **[3.1.8](https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/3.1.8)**
  - [com.github.jnr](https://repo1.maven.org/maven2/com/github/jnr/)
-    - [jffi](https://repo1.maven.org/maven2/com/github/jnr/jffi/) **[1.3.12](https://repo1.maven.org/maven2/com/github/jnr/jffi/1.3.12)** - *complete*
+    - [jffi](https://repo1.maven.org/maven2/com/github/jnr/jffi/) **[1.3.13](https://repo1.maven.org/maven2/com/github/jnr/jffi/1.3.13)** - *complete*
     - [jnr-constants](https://repo1.maven.org/maven2/com/github/jnr/jnr-constants/) **[0.10.4](https://repo1.maven.org/maven2/com/github/jnr/jnr-constants/0.10.4)**
-    - [jnr-enxio](https://repo1.maven.org/maven2/com/github/jnr/jnr-enxio/) **[0.32.16](https://repo1.maven.org/maven2/com/github/jnr/jnr-enxio/0.32.16)**
-    - [jnr-ffi](https://repo1.maven.org/maven2/com/github/jnr/jnr-ffi/) **[2.2.15](https://repo1.maven.org/maven2/com/github/jnr/jnr-ffi/2.2.15)**
-    - [jnr-posix](https://repo1.maven.org/maven2/com/github/jnr/jnr-posix/) **[3.1.18](https://repo1.maven.org/maven2/com/github/jnr/jnr-posix/3.1.18)**
-    - [jnr-unixsocket](https://repo1.maven.org/maven2/com/github/jnr/jnr-unixsocket/) **[0.38.21](https://repo1.maven.org/maven2/com/github/jnr/jnr-unixsocket/0.38.21)**
+    - [jnr-enxio](https://repo1.maven.org/maven2/com/github/jnr/jnr-enxio/) **[0.32.17](https://repo1.maven.org/maven2/com/github/jnr/jnr-enxio/0.32.17)**
+    - [jnr-ffi](https://repo1.maven.org/maven2/com/github/jnr/jnr-ffi/) **[2.2.16](https://repo1.maven.org/maven2/com/github/jnr/jnr-ffi/2.2.16)**
+    - [jnr-posix](https://repo1.maven.org/maven2/com/github/jnr/jnr-posix/) **[3.1.19](https://repo1.maven.org/maven2/com/github/jnr/jnr-posix/3.1.19)**
+    - [jnr-unixsocket](https://repo1.maven.org/maven2/com/github/jnr/jnr-unixsocket/) **[0.38.22](https://repo1.maven.org/maven2/com/github/jnr/jnr-unixsocket/0.38.22)**
  - [com.github.librepdf](https://repo1.maven.org/maven2/com/github/librepdf/)
     - [openpdf](https://repo1.maven.org/maven2/com/github/librepdf/openpdf/) **[1.3.40](https://repo1.maven.org/maven2/com/github/librepdf/openpdf/1.3.40)**
  - [com.github.oshi](https://repo1.maven.org/maven2/com/github/oshi/)

diff --git a/report/maven-sign/merged-target/REPORT.md b/report/maven-sign/merged-target/REPORT.md
@@ -2,6 +2,6 @@
 
 ## Content
  - [com.github.jnr](https://repo1.maven.org/maven2/com/github/jnr/)
-    - [jffi](https://repo1.maven.org/maven2/com/github/jnr/jffi/) **[1.3.12](https://repo1.maven.org/maven2/com/github/jnr/jffi/1.3.12)** - *native*
+    - [jffi](https://repo1.maven.org/maven2/com/github/jnr/jffi/) **[1.3.13](https://repo1.maven.org/maven2/com/github/jnr/jffi/1.3.13)** - *native*
  - [net.java.dev.jna](https://repo1.maven.org/maven2/net/java/dev/jna/)
     - [jna](https://repo1.maven.org/maven2/net/java/dev/jna/jna/) **[5.14.0](https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.14.0)**