[Git][java-team/wildfly-common][master] 5 commits: New upstream version 1.5.4

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / wildfly-common


Commits:
c2e71ea1 by Markus Koschany at 2020-03-11T13:37:33+01:00
New upstream version 1.5.4
- - - - -
72e1dfa8 by Markus Koschany at 2020-03-11T13:37:38+01:00
Update upstream source from tag 'upstream/1.5.4'

Update to upstream version '1.5.4'
with Debian dir 991cd4246cb6fd3588b3edc9241409a86a8bec1a
- - - - -
750be606 by Markus Koschany at 2020-03-11T13:47:18+01:00
Update changelog

- - - - -
8c5bb45c by Markus Koschany at 2020-03-11T13:49:00+01:00
Drop remove-Substitutions.java.patch

- - - - -
1ccf7e65 by Markus Koschany at 2020-03-11T13:50:55+01:00
Refresh remove-substitutions.patch

- - - - -


5 changed files:

- debian/changelog
- debian/patches/remove-Substitutions.java.patch → debian/patches/remove-substitutions.patch
- debian/patches/series
- pom.xml
- src/main/java/org/wildfly/common/net/Substitutions.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+wildfly-common (1.5.4-1) unstable; urgency=medium
+
+  * New upstream version 1.5.4.
+
+ -- Markus Koschany <apo at debian.org>  Wed, 11 Mar 2020 13:47:09 +0100
+
 wildfly-common (1.5.3-1) unstable; urgency=medium
 
   * New upstream version 1.5.3.


=====================================
debian/patches/remove-Substitutions.java.patch → debian/patches/remove-substitutions.patch
=====================================
@@ -1,17 +1,14 @@
 From: Markus Koschany <apo at debian.org>
-Date: Thu, 18 Jul 2019 17:06:07 +0200
-Subject: remove Substitutions.java
+Date: Wed, 11 Mar 2020 13:50:40 +0100
+Subject: remove substitutions
 
-Workaround for a FTBFS because of missing build-dependencies.
-
-Forwarded: not-needed
 ---
- .../java/org/wildfly/common/Substitutions.java     |  80 --------------
+ .../java/org/wildfly/common/Substitutions.java     |  80 -------------
  .../org/wildfly/common/lock/Substitutions.java     |  39 -------
- .../java/org/wildfly/common/net/Substitutions.java | 120 ---------------------
+ .../java/org/wildfly/common/net/Substitutions.java | 124 ---------------------
  .../java/org/wildfly/common/os/Substitutions.java  |  53 ---------
- .../org/wildfly/common/lock/Substitutions.java     |  30 ------
- 5 files changed, 322 deletions(-)
+ .../org/wildfly/common/lock/Substitutions.java     |  30 -----
+ 5 files changed, 326 deletions(-)
  delete mode 100644 src/main/java/org/wildfly/common/Substitutions.java
  delete mode 100644 src/main/java/org/wildfly/common/lock/Substitutions.java
  delete mode 100644 src/main/java/org/wildfly/common/net/Substitutions.java
@@ -151,10 +148,10 @@ index a7a5b1f..0000000
 -}
 diff --git a/src/main/java/org/wildfly/common/net/Substitutions.java b/src/main/java/org/wildfly/common/net/Substitutions.java
 deleted file mode 100644
-index 5ebb170..0000000
+index f9a826a..0000000
 --- a/src/main/java/org/wildfly/common/net/Substitutions.java
 +++ /dev/null
-@@ -1,120 +0,0 @@
+@@ -1,124 +0,0 @@
 -/*
 - * JBoss, Home of Professional Open Source.
 - * Copyright 2018 Red Hat, Inc., and individual contributors
@@ -181,6 +178,8 @@ index 5ebb170..0000000
 -
 -import com.oracle.svm.core.annotate.Substitute;
 -import com.oracle.svm.core.annotate.TargetClass;
+-import org.graalvm.nativeimage.Platform;
+-import org.graalvm.nativeimage.Platforms;
 -import org.graalvm.nativeimage.StackValue;
 -import org.graalvm.nativeimage.c.CContext;
 -import org.graalvm.nativeimage.c.function.CFunction;
@@ -193,6 +192,7 @@ index 5ebb170..0000000
 - */
 -final class Substitutions {
 -    @TargetClass(className = "org.wildfly.common.net.GetHostInfoAction")
+-    @Platforms({Platform.DARWIN.class, Platform.LINUX.class})
 -    static final class Target_org_wildfly_common_net_GetHostInfoAction {
 -        @Substitute
 -        public String[] run() {
@@ -259,6 +259,7 @@ index 5ebb170..0000000
 -    }
 -
 -    @CContext(NativeInfoDirectives.class)
+-    @Platforms({Platform.DARWIN.class, Platform.LINUX.class})
 -    static final class NativeInfo {
 -        @CFunction
 -        static native int gethostname(CCharPointer nameBuf, UnsignedWord /* size_t */ len);


=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-remove-Substitutions.java.patch
+remove-substitutions.patch


=====================================
pom.xml
=====================================
@@ -25,7 +25,7 @@
 
     <groupId>org.wildfly.common</groupId>
     <artifactId>wildfly-common</artifactId>
-    <version>1.5.3.Final</version>
+    <version>1.5.4.Final</version>
 
     <parent>
         <groupId>org.jboss</groupId>


=====================================
src/main/java/org/wildfly/common/net/Substitutions.java
=====================================
@@ -24,6 +24,8 @@ import java.util.List;
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.CContext;
 import org.graalvm.nativeimage.c.function.CFunction;
@@ -36,6 +38,7 @@ import org.graalvm.word.WordFactory;
  */
 final class Substitutions {
     @TargetClass(className = "org.wildfly.common.net.GetHostInfoAction")
+    @Platforms({Platform.DARWIN.class, Platform.LINUX.class})
     static final class Target_org_wildfly_common_net_GetHostInfoAction {
         @Substitute
         public String[] run() {
@@ -102,6 +105,7 @@ final class Substitutions {
     }
 
     @CContext(NativeInfoDirectives.class)
+    @Platforms({Platform.DARWIN.class, Platform.LINUX.class})
     static final class NativeInfo {
         @CFunction
         static native int gethostname(CCharPointer nameBuf, UnsignedWord /* size_t */ len);



View it on GitLab: https://salsa.debian.org/java-team/wildfly-common/-/compare/dd6e6c385c32733e343a66a5f47d0426d7a95a93...1ccf7e65af5e39695e1832e3c5290f654b8bb721

-- 
View it on GitLab: https://salsa.debian.org/java-team/wildfly-common/-/compare/dd6e6c385c32733e343a66a5f47d0426d7a95a93...1ccf7e65af5e39695e1832e3c5290f654b8bb721
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/20200311/a302e04f/attachment.html>