[Git][java-team/openhft-affinity][master] 8 commits: New upstream version 3.1.7
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Tue Sep 3 04:25:19 BST 2024
Tony Mancill pushed to branch master at Debian Java Maintainers / openhft-affinity
Commits:
a81ee6a0 by tony mancill at 2018-09-06T06:35:15-07:00
New upstream version 3.1.7
- - - - -
e535d39b by Vladimir Petko at 2023-11-28T09:37:49+13:00
New upstream version 3.23.3
- - - - -
43cd446e by tony mancill at 2024-09-02T20:11:47-07:00
New upstream version 3.23.3
- - - - -
11b3f22c by tony mancill at 2024-09-02T20:11:48-07:00
Update upstream source from tag 'upstream/3.23.3'
Update to upstream version '3.23.3'
with Debian dir e7e06954d4dba1d5c8e618a1ddd70a8ffc937a58
- - - - -
e5a4d89f by tony mancill at 2024-09-02T20:14:14-07:00
Drop Java 9 compatibility patch
- - - - -
74411cbe by tony mancill at 2024-09-02T20:18:37-07:00
Freshen years in debian/copyright
- - - - -
ea725c61 by tony mancill at 2024-09-02T20:19:12-07:00
Bump Standards-Version to 4.7.0
- - - - -
da24084f by tony mancill at 2024-09-02T20:20:18-07:00
Prepare changelog for upload
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/copyright
- − debian/patches/01-java9-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,5 +1,8 @@
-openhft-affinity (3.23.3-1) UNRELEASED; urgency=medium
+openhft-affinity (3.23.3-1) unstable; urgency=medium
+ * Team upload.
+
+ [ Vladimir Petko ]
* New upstream release 3.23.3 (Closes: #1053068).
* d/maven.properties: do not build jni library.
* d/control: update debhelper-compat to 13, Standards-Version to 4.6.2,
@@ -10,7 +13,12 @@ openhft-affinity (3.23.3-1) UNRELEASED; urgency=medium
* Drop patches:
- d/01-java9-compatibility.patch.
- -- Vladimir Petko <vladimir.petko at canonical.com> Tue, 28 Nov 2023 09:38:29 +1300
+ [ tony mancill ]
+ * Drop Java 9 compatibility patch
+ * Freshen years in debian/copyright
+ * Bump Standards-Version to 4.7.0
+
+ -- tony mancill <tmancill at debian.org> Mon, 02 Sep 2024 20:15:54 -0700
openhft-affinity (2.2-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends:
libmaven-bundle-plugin-java,
libslf4j-java,
maven-debian-helper (>= 2.0)
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Vcs-Git: https://salsa.debian.org/git/pkg-java/openhft-affinity.git
Vcs-Browser: https://salsa.debian.org/cgit/pkg-java/openhft-affinity.git
Homepage: http://chronicle.software/products/thread-affinity/
=====================================
debian/copyright
=====================================
@@ -3,7 +3,7 @@ Upstream-Name: OpenHFT Java Thread Affinity
Source: https://github.com/OpenHFT/Java-Thread-Affinity
Files: *
-Copyright: 2016-2022 chronicle.software
+Copyright: 2016-2023 chronicle.software
License: Apache-2.0
Files: affinity/src/main/c/net_openhft_ticker_impl_JNIClock.cpp
@@ -16,7 +16,7 @@ Copyright: 2011-2012 Peter Lawrey & Jerry Shea
License: Apache-2.0
Files: debian/*
-Copyright: 2016, Emmanuel Bourg <ebourg at apache.org>
+Copyright: 2016-2024, Emmanuel Bourg <ebourg at apache.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/patches/01-java9-compatibility.patch deleted
=====================================
@@ -1,150 +0,0 @@
-Description: Fixes a build failure with Java 9 caused by the removal of sun.misc.URLClassPath.
- This patch can be removed after upgrading to the version 3.1.1 or later.
-Origin: backport, https://github.com/OpenHFT/Java-Thread-Affinity/commit/da19214
-Bug-Debian: https://bugs.debian.org/875332
---- a/affinity/src/main/java/net/openhft/affinity/BootClassPath.java
-+++ b/affinity/src/main/java/net/openhft/affinity/BootClassPath.java
-@@ -1,60 +1,115 @@
- /*
-- * Copyright 2014 Higher Frequency Trading
-+ * Copyright 2016 higherfrequencytrading.com
- *
-- * http://www.higherfrequencytrading.com
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-+ * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-+ *
- */
-
- package net.openhft.affinity;
-
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
--import sun.misc.URLClassPath;
-
--import java.io.File;
--import java.net.MalformedURLException;
--import java.net.URL;
-+import java.io.IOException;
-+import java.nio.file.FileVisitResult;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.nio.file.SimpleFileVisitor;
-+import java.nio.file.attribute.BasicFileAttributes;
-+import java.util.Collections;
-+import java.util.Enumeration;
-+import java.util.HashSet;
-+import java.util.Set;
-+import java.util.jar.JarEntry;
-+import java.util.jar.JarFile;
-
- enum BootClassPath {
- INSTANCE;
-
-- private final URLClassPath bootClassPath = new URLClassPath(getBootClassPathURLs());
-+ private final Set<String> bootClassPathResources = Collections.unmodifiableSet(getResourcesOnBootClasspath());
-
- public final boolean has(String binaryClassName) {
-- String resourceClassName = binaryClassName.replace('.', '/').concat(".class");
-- return bootClassPath.getResource(resourceClassName, false) != null;
-+ final String resourceClassName = binaryClassName.replace('.', '/').concat(".class");
-+ return bootClassPathResources.contains(resourceClassName);
- }
-
-- private URL[] getBootClassPathURLs() {
-- Logger LOGGER = LoggerFactory.getLogger(BootClassPath.class);
-- try {
-- String bootClassPath = System.getProperty("sun.boot.class.path");
-- LOGGER.trace("Boot class-path is: {}",bootClassPath);
-+ private static Set<String> getResourcesOnBootClasspath() {
-+ final Logger logger = LoggerFactory.getLogger(BootClassPath.class);
-+ final Set<String> resources = new HashSet<>();
-+ final String bootClassPath = System.getProperty("sun.boot.class.path");
-+ logger.trace("Boot class-path is: {}", bootClassPath);
-+
-+ final String pathSeparator = System.getProperty("path.separator");
-+ logger.trace("Path separator is: '{}'", pathSeparator);
-+
-+ final String[] pathElements = bootClassPath.split(pathSeparator);
-+
-+ for (final String pathElement : pathElements) {
-+ resources.addAll(findResources(Paths.get(pathElement), logger));
-+ }
-+
-+ return resources;
-+ }
-+
-+ private static Set<String> findResources(final Path path, final Logger logger) {
-+ if (!Files.exists(path)) {
-+ return Collections.emptySet();
-+ }
-
-- String pathSeparator = System.getProperty("path.separator");
-- LOGGER.trace("Path separator is: '{}'", pathSeparator);
-+ if (Files.isDirectory(path)) {
-+ return findResourcesInDirectory(path, logger);
-+ }
-+
-+ return findResourcesInJar(path, logger);
-+ }
-
-- String[] pathElements = bootClassPath.split(pathSeparator);
-- URL[] pathURLs = new URL[pathElements.length];
-- for (int i = 0; i < pathElements.length; i++) {
-- pathURLs[i] = new File(pathElements[i]).toURI().toURL();
-+ private static Set<String> findResourcesInJar(final Path path, final Logger logger) {
-+ final Set<String> jarResources = new HashSet<>();
-+ try {
-+ final JarFile jarFile = new JarFile(path.toFile());
-+ final Enumeration<JarEntry> entries = jarFile.entries();
-+ while (entries.hasMoreElements()) {
-+ final JarEntry jarEntry = entries.nextElement();
-+ if (jarEntry.getName().endsWith(".class")) {
-+ jarResources.add(jarEntry.getName());
-+ }
- }
-
-- return pathURLs;
-- } catch (MalformedURLException e) {
-- LOGGER.warn("Parsing the boot class-path failed! Reason: {}", e.getMessage());
-- return new URL[0];
-+
-+ } catch (IOException e) {
-+ logger.warn("Not a jar file: {}", path);
- }
-+
-+ return jarResources;
-+ }
-+
-+ private static Set<String> findResourcesInDirectory(final Path path, final Logger logger) {
-+ final Set<String> dirResources = new HashSet<>();
-+ try {
-+ Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
-+ @Override
-+ public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
-+ if (file.getFileName().toString().endsWith(".class")) {
-+ dirResources.add(path.relativize(file).toString());
-+ }
-+ return super.visitFile(file, attrs);
-+ }
-+ });
-+ } catch (IOException e) {
-+ logger.warn("Error walking dir: " + path, e);
-+ }
-+
-+ return dirResources;
- }
- }
=====================================
debian/patches/series
=====================================
@@ -1 +0,0 @@
-01-java9-compatibility.patch
View it on GitLab: https://salsa.debian.org/java-team/openhft-affinity/-/compare/46d0749f76508585b895608c2d688d62357ee6a4...da24084fa9e3539f986d96cda13db8f6856ff9e5
--
View it on GitLab: https://salsa.debian.org/java-team/openhft-affinity/-/compare/46d0749f76508585b895608c2d688d62357ee6a4...da24084fa9e3539f986d96cda13db8f6856ff9e5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240903/6cee0aee/attachment.htm>
More information about the pkg-java-commits
mailing list