You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2018/03/06 14:08:00 UTC
[1/4] deltaspike git commit: update maven-checkstyle-plugin version
for java8
Repository: deltaspike
Updated Branches:
refs/heads/master 5b07e197c -> 73cb1ca7a
update maven-checkstyle-plugin version for java8
The old checkstyle-plugin did blow up with default methods.
The new checkstyle is a bit more picky.
It also complains about wrong modifiers.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7adfab6a
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7adfab6a
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7adfab6a
Branch: refs/heads/master
Commit: 7adfab6afa06e61a696b1d59d614a145705c38ea
Parents: 5b07e19
Author: Mark Struberg <st...@apache.org>
Authored: Tue Mar 6 12:59:07 2018 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Mar 6 12:59:07 2018 +0100
----------------------------------------------------------------------
.../core/api/config/view/controller/ViewControllerRef.java | 2 +-
.../org/apache/deltaspike/core/util/ParentExtensionStorage.java | 2 +-
.../core/util/metadata/builder/AnnotatedConstructorImpl.java | 2 +-
.../deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java | 2 +-
.../deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java | 2 +-
.../core/util/metadata/builder/AnnotatedParameterImpl.java | 2 +-
.../deltaspike/core/util/metadata/builder/AnnotationBuilder.java | 2 +-
.../core/util/metadata/builder/ParameterValueRedefiner.java | 2 +-
deltaspike/parent/pom.xml | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/controller/ViewControllerRef.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/controller/ViewControllerRef.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/controller/ViewControllerRef.java
index a767e84..1e7b803 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/controller/ViewControllerRef.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/controller/ViewControllerRef.java
@@ -77,7 +77,7 @@ public @interface ViewControllerRef
}
//not needed outside
- static class Descriptor extends SimpleCallbackDescriptor<Void>
+ class Descriptor extends SimpleCallbackDescriptor<Void>
{
protected Descriptor(Class<?> beanClass, Class<? extends Annotation> callbackType)
{
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
index 587c39e..8f892f0 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
@@ -135,7 +135,7 @@ public final class ParentExtensionStorage
private final WeakReference<ClassLoader> classLoader;
private final WeakReference<Extension> extension;
- public ExtensionStorageInfo(ClassLoader classLoader, Extension extension)
+ ExtensionStorageInfo(ClassLoader classLoader, Extension extension)
{
this.classLoader = new WeakReference<ClassLoader>(classLoader);
this.extension = new WeakReference<Extension>(extension);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
index 310400c..206577c 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
@@ -35,7 +35,7 @@ class AnnotatedConstructorImpl<X> extends AnnotatedCallableImpl<X, Constructor<X
/**
* Constructor
*/
- public AnnotatedConstructorImpl(AnnotatedTypeImpl<X> type, Constructor<?> constructor, AnnotationStore annotations,
+ AnnotatedConstructorImpl(AnnotatedTypeImpl<X> type, Constructor<?> constructor, AnnotationStore annotations,
Map<Integer, AnnotationStore> parameterAnnotations,
Map<Integer, Type> typeOverrides)
{
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
index e0ddee6..94ee5ee 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
@@ -34,7 +34,7 @@ class AnnotatedFieldImpl<X> extends AnnotatedMemberImpl<X, Field> implements Ann
/**
* Constructor.
*/
- public AnnotatedFieldImpl(AnnotatedType<X> declaringType, Field field, AnnotationStore annotations,
+ AnnotatedFieldImpl(AnnotatedType<X> declaringType, Field field, AnnotationStore annotations,
Type overriddenType)
{
super(declaringType, field, field.getType(), annotations, field.getGenericType(), overriddenType);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
index 63e399a..e7bd64d 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
@@ -34,7 +34,7 @@ class AnnotatedMethodImpl<X> extends AnnotatedCallableImpl<X, Method> implements
/**
* Constructor.
*/
- public AnnotatedMethodImpl(AnnotatedType<X> type,
+ AnnotatedMethodImpl(AnnotatedType<X> type,
Method method,
AnnotationStore annotations,
Map<Integer, AnnotationStore> parameterAnnotations,
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
index 916e1b2..53cf86f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
@@ -35,7 +35,7 @@ class AnnotatedParameterImpl<X> extends AnnotatedImpl implements AnnotatedParame
/**
* Constructor
*/
- public AnnotatedParameterImpl(AnnotatedCallable<X> declaringCallable, Class<?> type, int position,
+ AnnotatedParameterImpl(AnnotatedCallable<X> declaringCallable, Class<?> type, int position,
AnnotationStore annotations, Type genericType, Type typeOverride)
{
super(type, annotations, genericType, typeOverride);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
index d4c690d..da93230 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
@@ -41,7 +41,7 @@ class AnnotationBuilder
/**
* Default constructor.
*/
- public AnnotationBuilder()
+ AnnotationBuilder()
{
annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
annotationSet = new HashSet<Annotation>();
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
index c9e2a47..7f87aac 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
@@ -48,7 +48,7 @@ public interface ParameterValueRedefiner
* @see ParameterValueRedefiner
* @see InjectableMethod
*/
- public static class ParameterValue
+ class ParameterValue
{
private final int position;
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7adfab6a/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 7efbe5d..d8ce300 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -94,7 +94,7 @@
<maven.bundle.plugin.version>2.3.7</maven.bundle.plugin.version>
<maven.jar.plugin.version>2.4</maven.jar.plugin.version>
<maven.dependency.plugin.version>2.4</maven.dependency.plugin.version>
- <maven.checkstyle.plugin.version>2.9.1</maven.checkstyle.plugin.version>
+ <maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
<maven.compiler.plugin.version>2.5</maven.compiler.plugin.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<maven.artifact.version>3.0</maven.artifact.version>
[4/4] deltaspike git commit: DELTASPIKE-1277 actively update the
Config
Posted by st...@apache.org.
DELTASPIKE-1277 actively update the Config
ConfigSources can now actively tell the Config that
they got new values.
Might get used to eagerly push changes to the clients.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/73cb1ca7
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/73cb1ca7
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/73cb1ca7
Branch: refs/heads/master
Commit: 73cb1ca7ab185a09279cf8cd1d1331b436fca467
Parents: 91e3a17
Author: Mark Struberg <st...@apache.org>
Authored: Tue Mar 6 15:05:54 2018 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Mar 6 15:05:54 2018 +0100
----------------------------------------------------------------------
.../core/spi/config/ConfigSource.java | 21 +++++++++++++++++++-
.../deltaspike/core/impl/config/ConfigImpl.java | 18 +++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/73cb1ca7/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/ConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/ConfigSource.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/ConfigSource.java
index 4c71b90..10fe39d 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/ConfigSource.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/ConfigSource.java
@@ -19,6 +19,8 @@
package org.apache.deltaspike.core.spi.config;
import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
/**
* <p>Implement this interfaces to provide a ConfigSource.
@@ -102,5 +104,22 @@ public interface ConfigSource
* @return true if this ConfigSource should be scanned for its list of properties,
* false if it should not be scanned.
*/
- boolean isScannable();
+ boolean isScannable();
+
+ /**
+ * This callback should get invoked if an attribute change got detected inside the ConfigSource.
+ *
+ * An example would be a database backed ConfigSource which scans the DB every second in a background task.
+ * And once it detects a change in values, it will notify the Config about the changed attributes
+ * by invoking {@code reportAttributeChange.accept(changedKeys);}
+ *
+ * @param reportAttributeChange will be set by the {@link org.apache.deltaspike.core.api.config.Config} after this
+ * {@code ConfigSource} got created and before any configured values
+ * get served.
+ */
+ default void setOnAttributeChange(Consumer<Set<String>> reportAttributeChange)
+ {
+ // do nothing by default. Just for compat with older ConfigSources.
+ }
+
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/73cb1ca7/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigImpl.java
index 6f60dda..af0e414 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigImpl.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigImpl.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -45,6 +46,9 @@ public class ConfigImpl implements Config
private ConfigSource[] configSources;
private List<ConfigFilter> configFilters;
+ // volatile to a.) make the read/write behave atomic and b.) guarantee multi-thread safety
+ private volatile long lastChanged = 0;
+
public ConfigImpl(ClassLoader classLoader)
{
this.classLoader = classLoader;
@@ -97,6 +101,7 @@ public class ConfigImpl implements Config
{
for (ConfigSource configSource : this.configSources)
{
+ configSource.setOnAttributeChange(this::onAttributeChange);
allConfigSources.add(configSource);
}
}
@@ -161,4 +166,17 @@ public class ConfigImpl implements Config
return configSources.toArray(new ConfigSource[configSources.size()]);
}
+ public void onAttributeChange(Set<String> attributesChanged)
+ {
+ lastChanged = System.nanoTime();
+ }
+
+ /**
+ * @return the nanoTime when the last change got reported by a ConfigSource
+ */
+ public long getLastChanged()
+ {
+ return lastChanged;
+ }
+
}
[2/4] deltaspike git commit: DELTASPIKE-1323 upgrade to more recent
OSGi
Posted by st...@apache.org.
DELTASPIKE-1323 upgrade to more recent OSGi
The old maven-bundle-plugin didn't work for Java8.
When upgrading to a more recent version tons of different
things broke apart.
I had to change the packaging from 'bundle' to 'jar'
to make things compile again.
This should get fixed and we should fix OSGi again.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/00f2ba3f
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/00f2ba3f
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/00f2ba3f
Branch: refs/heads/master
Commit: 00f2ba3ffc0a6b8e6e1c1762ae886e78d7101e2b
Parents: 7adfab6
Author: Mark Struberg <st...@apache.org>
Authored: Tue Mar 6 14:48:04 2018 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Mar 6 14:48:04 2018 +0100
----------------------------------------------------------------------
deltaspike/core/api/pom.xml | 2 +-
deltaspike/core/impl/pom.xml | 2 +-
deltaspike/modules/bean-validation/impl/pom.xml | 2 +-
deltaspike/modules/data/api/pom.xml | 2 +-
deltaspike/modules/data/impl/pom.xml | 2 +-
deltaspike/modules/jpa/api/pom.xml | 2 +-
deltaspike/modules/jpa/impl/pom.xml | 2 +-
deltaspike/modules/partial-bean/api/pom.xml | 2 +-
deltaspike/modules/partial-bean/impl/pom.xml | 2 +-
deltaspike/modules/proxy/api/pom.xml | 2 +-
deltaspike/modules/proxy/impl-asm/pom.xml | 2 +-
deltaspike/modules/scheduler/api/pom.xml | 2 +-
deltaspike/modules/scheduler/impl/pom.xml | 2 +-
deltaspike/modules/security/api/pom.xml | 2 +-
deltaspike/modules/security/impl/pom.xml | 2 +-
deltaspike/modules/test-control/api/pom.xml | 2 +-
deltaspike/modules/test-control/impl/pom.xml | 2 +-
deltaspike/parent/pom.xml | 4 ++--
18 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/core/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/pom.xml b/deltaspike/core/api/pom.xml
index 00e7f70..1de2eaa 100644
--- a/deltaspike/core/api/pom.xml
+++ b/deltaspike/core/api/pom.xml
@@ -48,7 +48,7 @@
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Core-API</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/core/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/pom.xml b/deltaspike/core/impl/pom.xml
index 5ee522a..e4bcb90 100644
--- a/deltaspike/core/impl/pom.xml
+++ b/deltaspike/core/impl/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Core-Implementation</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/bean-validation/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/bean-validation/impl/pom.xml b/deltaspike/modules/bean-validation/impl/pom.xml
index 41571b8..45942ec 100644
--- a/deltaspike/modules/bean-validation/impl/pom.xml
+++ b/deltaspike/modules/bean-validation/impl/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>deltaspike-bean-validation-module-impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike BeanValidation-Module Impl</name>
<properties>
<deltaspike.osgi.export.pkg>org.apache.deltaspike.beanvalidation.impl.*</deltaspike.osgi.export.pkg>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/data/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/api/pom.xml b/deltaspike/modules/data/api/pom.xml
index 0398812..d3eafe5 100755
--- a/deltaspike/modules/data/api/pom.xml
+++ b/deltaspike/modules/data/api/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>deltaspike-data-module-api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Data-Module API</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/data/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index 4ab2fa1..5f7b82a 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>deltaspike-data-module-impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Data-Module Impl</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/jpa/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/api/pom.xml b/deltaspike/modules/jpa/api/pom.xml
index 74b3982..74bbb5e 100644
--- a/deltaspike/modules/jpa/api/pom.xml
+++ b/deltaspike/modules/jpa/api/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-jpa-module-api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike JPA-Module API</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/jpa/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/pom.xml b/deltaspike/modules/jpa/impl/pom.xml
index f113f94..2326ccd 100644
--- a/deltaspike/modules/jpa/impl/pom.xml
+++ b/deltaspike/modules/jpa/impl/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-jpa-module-impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike JPA-Module Impl</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/partial-bean/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/api/pom.xml b/deltaspike/modules/partial-bean/api/pom.xml
index bad5f51..0f7f7cc 100644
--- a/deltaspike/modules/partial-bean/api/pom.xml
+++ b/deltaspike/modules/partial-bean/api/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-partial-bean-module-api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Partial-Bean-Module API</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/partial-bean/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/pom.xml b/deltaspike/modules/partial-bean/impl/pom.xml
index a8d6a3c..0aa7236 100644
--- a/deltaspike/modules/partial-bean/impl/pom.xml
+++ b/deltaspike/modules/partial-bean/impl/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-partial-bean-module-impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Partial-Bean-Module Impl</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/proxy/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/api/pom.xml b/deltaspike/modules/proxy/api/pom.xml
index 8222358..4752056 100644
--- a/deltaspike/modules/proxy/api/pom.xml
+++ b/deltaspike/modules/proxy/api/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>deltaspike-proxy-module-api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Proxy-Module API</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/proxy/impl-asm/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/impl-asm/pom.xml b/deltaspike/modules/proxy/impl-asm/pom.xml
index ad472b3..7912f82 100644
--- a/deltaspike/modules/proxy/impl-asm/pom.xml
+++ b/deltaspike/modules/proxy/impl-asm/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>deltaspike-proxy-module-impl-asm</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Proxy-Module Impl ASM</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/scheduler/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/api/pom.xml b/deltaspike/modules/scheduler/api/pom.xml
index 10256b2..2b9a0ec 100644
--- a/deltaspike/modules/scheduler/api/pom.xml
+++ b/deltaspike/modules/scheduler/api/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-scheduler-module-api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Scheduler-Module API</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/scheduler/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/pom.xml b/deltaspike/modules/scheduler/impl/pom.xml
index f582688..1fa8c0b 100644
--- a/deltaspike/modules/scheduler/impl/pom.xml
+++ b/deltaspike/modules/scheduler/impl/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-scheduler-module-impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Scheduler-Module Impl</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/security/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/pom.xml b/deltaspike/modules/security/api/pom.xml
index f004ed6..5881a34 100644
--- a/deltaspike/modules/security/api/pom.xml
+++ b/deltaspike/modules/security/api/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-security-module-api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Security-Module API</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/security/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/pom.xml b/deltaspike/modules/security/impl/pom.xml
index 9d3158a..2366197 100644
--- a/deltaspike/modules/security/impl/pom.xml
+++ b/deltaspike/modules/security/impl/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-security-module-impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Security-Module Impl</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/test-control/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/api/pom.xml b/deltaspike/modules/test-control/api/pom.xml
index 6d37e20..b1aa250 100644
--- a/deltaspike/modules/test-control/api/pom.xml
+++ b/deltaspike/modules/test-control/api/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-test-control-module-api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Test-Control-Module API</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/modules/test-control/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/pom.xml b/deltaspike/modules/test-control/impl/pom.xml
index 11552a9..a8b7c55 100644
--- a/deltaspike/modules/test-control/impl/pom.xml
+++ b/deltaspike/modules/test-control/impl/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-test-control-module-impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Apache DeltaSpike Test-Control-Module Impl</name>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/00f2ba3f/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index d8ce300..1f0cefc 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -91,10 +91,10 @@
<maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
<maven.surefire.plugin.version>2.19.1</maven.surefire.plugin.version>
- <maven.bundle.plugin.version>2.3.7</maven.bundle.plugin.version>
+ <maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version>
<maven.jar.plugin.version>2.4</maven.jar.plugin.version>
<maven.dependency.plugin.version>2.4</maven.dependency.plugin.version>
- <maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
+ <maven.checkstyle.plugin.version>2.16</maven.checkstyle.plugin.version>
<maven.compiler.plugin.version>2.5</maven.compiler.plugin.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<maven.artifact.version>3.0</maven.artifact.version>
[3/4] deltaspike git commit: upgrade to a maven-checkstyle-plugin for
Java8
Posted by st...@apache.org.
upgrade to a maven-checkstyle-plugin for Java8
Sadly all the new versions behave slightly different.
That's of course not good but the additional failures are reasonable at
least.
I went through all the complaints and fixed them.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/91e3a170
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/91e3a170
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/91e3a170
Branch: refs/heads/master
Commit: 91e3a170edbbf190606147ab4894d2cd59ebfc49
Parents: 00f2ba3
Author: Mark Struberg <st...@apache.org>
Authored: Tue Mar 6 14:51:28 2018 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Mar 6 14:51:28 2018 +0100
----------------------------------------------------------------------
.../deltaspike/cdise/tck/ContainerCtrlTckTest.java | 4 ++--
.../core/impl/config/ConfigResolverContext.java | 14 +++++++-------
.../core/impl/config/DeltaSpikeConfigInfo.java | 8 ++++----
.../impl/config/EnvironmentPropertyConfigSource.java | 2 +-
.../core/impl/config/LocalJndiConfigSource.java | 2 +-
.../core/impl/config/TypedResolverImpl.java | 2 +-
.../apache/deltaspike/core/impl/jmx/Operation.java | 6 +++---
.../core/impl/message/DefaultMessageContext.java | 4 ++--
.../InjectableGroupedConversationManager.java | 2 +-
.../apache/deltaspike/example/viewconfig/Pages.java | 2 +-
10 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
index 536508b..f33a199 100644
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
@@ -225,11 +225,11 @@ public class ContainerCtrlTckTest
cdiContainer.shutdown();
}
- @Test
@LockedCDIImplementation(versions = {
@LockedVersionRange(implementation = CdiImplementation.WELD11, versionRange = "[1.1.14,1.2)"),
@LockedVersionRange(implementation = CdiImplementation.WELD20, versionRange = "[2.0.1.Final,2.1)")
- })
+ })
+ @Test
public void testShutdownWithInactiveContexts()
{
CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java
index 4f3997c..bf08982 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java
@@ -34,39 +34,39 @@ class ConfigResolverContext
private boolean evaluateVariables;
private boolean propertyAware;
- public ConfigResolverContext()
+ ConfigResolverContext()
{
}
- public ConfigResolverContext setEvaluateVariables(final boolean evaluateVariables)
+ ConfigResolverContext setEvaluateVariables(final boolean evaluateVariables)
{
this.evaluateVariables = evaluateVariables;
return this;
}
- public boolean isEvaluateVariables()
+ boolean isEvaluateVariables()
{
return evaluateVariables;
}
- public ConfigResolverContext setProjectStageAware(final boolean projectStageAware)
+ ConfigResolverContext setProjectStageAware(final boolean projectStageAware)
{
this.projectStageAware = projectStageAware;
return this;
}
- public boolean isProjectStageAware()
+ boolean isProjectStageAware()
{
return projectStageAware;
}
- public ConfigResolverContext setPropertyAware(final boolean propertyAware)
+ ConfigResolverContext setPropertyAware(final boolean propertyAware)
{
this.propertyAware = propertyAware;
return this;
}
- public boolean isPropertyAware()
+ boolean isPropertyAware()
{
return propertyAware;
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java
index 286806b..6efb1e7 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java
@@ -226,24 +226,24 @@ public class DeltaSpikeConfigInfo implements DeltaSpikeConfigInfoMBean
private final String value;
private final String fromConfigSource;
- public ConfigEntry(String key, String value, String fromConfigSource)
+ ConfigEntry(String key, String value, String fromConfigSource)
{
this.key = key;
this.value = value;
this.fromConfigSource = fromConfigSource;
}
- public String getKey()
+ String getKey()
{
return key;
}
- public String getValue()
+ String getValue()
{
return value;
}
- public String getFromConfigSource()
+ String getFromConfigSource()
{
return fromConfigSource;
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java
index 5c5ea5d..b1ff8d1 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java
@@ -30,7 +30,7 @@ package org.apache.deltaspike.core.impl.config;
class EnvironmentPropertyConfigSource extends MapConfigSource
{
- public EnvironmentPropertyConfigSource()
+ EnvironmentPropertyConfigSource()
{
super(System.getenv());
initOrdinal(300);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
index bcc4b20..df7aea2 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
@@ -34,7 +34,7 @@ class LocalJndiConfigSource extends BaseConfigSource
{
private static final String BASE_NAME = "java:comp/env/deltaspike/";
- public LocalJndiConfigSource()
+ LocalJndiConfigSource()
{
initOrdinal(200);
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java
index df36054..c7d3f85 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java
@@ -70,7 +70,7 @@ public class TypedResolverImpl<T> implements ConfigResolver.UntypedResolver<T>
private T lastValue = null;
- public TypedResolverImpl(ConfigImpl config, String propertyName)
+ TypedResolverImpl(ConfigImpl config, String propertyName)
{
this.config = config;
this.keyOriginal = propertyName;
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java
index 40920bc..6a9ccab 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java
@@ -28,18 +28,18 @@ class Operation
private final Method operation;
private final boolean presentAsTabularIfPossible;
- public Operation(final Method operation, final boolean presentAsTabularIfPossible)
+ Operation(final Method operation, final boolean presentAsTabularIfPossible)
{
this.operation = operation;
this.presentAsTabularIfPossible = presentAsTabularIfPossible;
}
- public boolean isPresentAsTabularIfPossible()
+ boolean isPresentAsTabularIfPossible()
{
return presentAsTabularIfPossible;
}
- public Method getOperation()
+ Method getOperation()
{
return operation;
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java
index b776471..44fb945 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java
@@ -50,11 +50,11 @@ class DefaultMessageContext implements MessageContext
private List<String> messageSources = new ArrayList<String>();
- public DefaultMessageContext()
+ DefaultMessageContext()
{
}
- public DefaultMessageContext(MessageContext otherMessageContext)
+ DefaultMessageContext(MessageContext otherMessageContext)
{
messageInterpolator(otherMessageContext.getMessageInterpolator());
localeResolver(otherMessageContext.getLocaleResolver());
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java
index f88d491..56fcdf7 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java
@@ -32,7 +32,7 @@ class InjectableGroupedConversationManager implements GroupedConversationManager
{
private transient volatile GroupedConversationManager conversationManager;
- public InjectableGroupedConversationManager(GroupedConversationManager conversationManager)
+ InjectableGroupedConversationManager(GroupedConversationManager conversationManager)
{
this.conversationManager = conversationManager;
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java
index 9029958..cac53ed 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java
@@ -53,7 +53,7 @@ public interface Pages extends ViewConfig
@NavigationParameter.List({
@NavigationParameter(key = "param1", value = "Hey, I come from a navigation parameter"),
@NavigationParameter(key = "param2", value = "Hey, It's an interpolated value: #{myBean.aValue}")
- })
+ })
class NavigationParameterPage implements RedirectedPages
{
}