karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject [karaf] branch master updated: [KARAF-5610] :angry: Move @XmlAccessorType annotations from package-info to satisfy JDK9
Date Tue, 13 Feb 2018 18:43:50 GMT
This is an automated email from the ASF dual-hosted git repository.

ggrzybek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 72d1231  [KARAF-5610] :angry: Move @XmlAccessorType annotations from package-info
to satisfy JDK9
72d1231 is described below

commit 72d1231d9ed82a1659d6f0eb8f54aa14e237402b
Author: Grzegorz Grzybek <gr.grzybek@gmail.com>
AuthorDate: Tue Feb 13 19:43:36 2018 +0100

    [KARAF-5610] :angry: Move @XmlAccessorType annotations from package-info to satisfy JDK9
---
 .../features/internal/model/processing/BundleReplacements.java      | 4 ++++
 .../features/internal/model/processing/FeatureReplacements.java     | 4 ++++
 .../features/internal/model/processing/FeaturesProcessing.java      | 4 ++++
 .../internal/model/processing/OverrideBundleDependency.java         | 5 +++++
 .../karaf/features/internal/model/processing/package-info.java      | 6 +-----
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/BundleReplacements.java
b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/BundleReplacements.java
index ad309be..a5ebfbd 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/BundleReplacements.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/BundleReplacements.java
@@ -21,6 +21,8 @@ package org.apache.karaf.features.internal.model.processing;
 import java.net.MalformedURLException;
 import java.util.LinkedList;
 import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlEnum;
@@ -33,6 +35,7 @@ import org.apache.karaf.features.LocationPattern;
 @XmlType(name = "bundleReplacements", propOrder = {
         "overrideBundles"
 })
+@XmlAccessorType(XmlAccessType.FIELD)
 public class BundleReplacements {
 
     @XmlElement(name = "bundle")
@@ -52,6 +55,7 @@ public class BundleReplacements {
     }
 
     @XmlType(name = "overrideBundle")
+    @XmlAccessorType(XmlAccessType.FIELD)
     public static class OverrideBundle {
         @XmlAttribute
         private String originalUri;
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java
b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java
index 2f36dd2..eddef28 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java
@@ -20,6 +20,8 @@ package org.apache.karaf.features.internal.model.processing;
 
 import java.util.LinkedList;
 import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlEnum;
@@ -32,6 +34,7 @@ import org.apache.karaf.features.internal.model.Feature;
 @XmlType(name = "featureReplacements", propOrder = {
         "replacements"
 })
+@XmlAccessorType(XmlAccessType.FIELD)
 public class FeatureReplacements {
 
     @XmlElement(name = "replacement")
@@ -55,6 +58,7 @@ public class FeatureReplacements {
     @XmlType(name = "overrideFeature", propOrder = {
             "feature"
     })
+    @XmlAccessorType(XmlAccessType.FIELD)
     public static class OverrideFeature {
         @XmlAttribute
         private FeatureOverrideMode mode = FeatureOverrideMode.REPLACE;
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeaturesProcessing.java
b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeaturesProcessing.java
index 4b37362..f38cf3b 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeaturesProcessing.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeaturesProcessing.java
@@ -26,6 +26,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
@@ -60,6 +62,7 @@ import static org.apache.karaf.features.internal.service.Overrides.OVERRIDE_RANG
         "bundleReplacements",
         "featureReplacements"
 })
+@XmlAccessorType(XmlAccessType.FIELD)
 public class FeaturesProcessing {
 
     public static Logger LOG = LoggerFactory.getLogger(FeaturesProcessing.class);
@@ -290,6 +293,7 @@ public class FeaturesProcessing {
     }
 
     @XmlType(name = "blacklistedFeature")
+    @XmlAccessorType(XmlAccessType.FIELD)
     public static class BlacklistedFeature {
         @XmlValue
         private String name;
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/OverrideBundleDependency.java
b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/OverrideBundleDependency.java
index 398e0c2..acb3325 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/OverrideBundleDependency.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/OverrideBundleDependency.java
@@ -20,6 +20,8 @@ package org.apache.karaf.features.internal.model.processing;
 
 import java.util.LinkedList;
 import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
@@ -29,6 +31,7 @@ import javax.xml.bind.annotation.XmlType;
         "features",
         "bundles"
 })
+@XmlAccessorType(XmlAccessType.FIELD)
 public class OverrideBundleDependency {
 
     @XmlElement(name = "repository")
@@ -51,6 +54,7 @@ public class OverrideBundleDependency {
     }
 
     @XmlType(name = "overrideDependency")
+    @XmlAccessorType(XmlAccessType.FIELD)
     public static class OverrideDependency {
         @XmlAttribute
         private String uri;
@@ -75,6 +79,7 @@ public class OverrideBundleDependency {
     }
 
     @XmlType(name = "overrideFeatureDependency")
+    @XmlAccessorType(XmlAccessType.FIELD)
     public static class OverrideFeatureDependency {
         @XmlAttribute
         private String name;
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/package-info.java
b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/package-info.java
index 8086150..07f00ff 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/package-info.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/package-info.java
@@ -17,16 +17,12 @@
 @XmlSchema(namespace = "http://karaf.apache.org/xmlns/features-processing/v1.0.0",
         elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED,
         xmlns = {
-                @XmlNs(prefix = "", namespaceURI = FEATURES_PROCESSING_NS
-                ),
+                @XmlNs(prefix = "", namespaceURI = FEATURES_PROCESSING_NS),
                 @XmlNs(prefix = "f", namespaceURI = FeaturesNamespaces.URI_CURRENT)
         }
 )
-@XmlAccessorType(XmlAccessType.FIELD)
 package org.apache.karaf.features.internal.model.processing;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlSchema;

-- 
To stop receiving notification emails like this one, please contact
ggrzybek@apache.org.

Mime
View raw message