Merge pull request #5 from fpapon/DOC
Fix typo in documentation module name
diff --git a/pom.xml b/pom.xml
index 4ab2fa9..b89db6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,10 +37,10 @@
<name>Apache Winegrower</name>
<properties>
- <junit.version>5.5.2</junit.version>
+ <junit.version>5.6.2</junit.version>
<osgi.version>7.0.0</osgi.version>
- <slf4j.version>1.7.28</slf4j.version>
- <xbean.version>4.15</xbean.version>
+ <slf4j.version>1.7.30</slf4j.version>
+ <xbean.version>4.17</xbean.version>
<surefire.log.level>INFO</surefire.log.level>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>28.0-jre</version>
+ <version>29.0-jre</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -116,8 +116,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
diff --git a/winegrower-cepages/pom.xml b/winegrower-cepages/pom.xml
index 9a47614..a6916f0 100644
--- a/winegrower-cepages/pom.xml
+++ b/winegrower-cepages/pom.xml
@@ -36,8 +36,8 @@
<packaging>pom</packaging>
<properties>
- <karaf.version>4.2.1</karaf.version>
- <cxf.version>3.2.6</cxf.version>
+ <karaf.version>4.2.8</karaf.version>
+ <cxf.version>3.4.0</cxf.version>
</properties>
<modules>
diff --git a/winegrower-cepages/winegrower-cepage-cxf-rs/pom.xml b/winegrower-cepages/winegrower-cepage-cxf-rs/pom.xml
index 3c14263..e7d3bf8 100644
--- a/winegrower-cepages/winegrower-cepage-cxf-rs/pom.xml
+++ b/winegrower-cepages/winegrower-cepage-cxf-rs/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>1.1.2</version>
+ <version>1.1.8</version>
</dependency>
</dependencies>
diff --git a/winegrower-cepages/winegrower-cepage-http/pom.xml b/winegrower-cepages/winegrower-cepage-http/pom.xml
index 7de52b7..97471ca 100644
--- a/winegrower-cepages/winegrower-cepage-http/pom.xml
+++ b/winegrower-cepages/winegrower-cepage-http/pom.xml
@@ -35,14 +35,14 @@
<packaging>pom</packaging>
<properties>
- <pax-web.version>7.2.3</pax-web.version>
+ <pax-web.version>7.3.8</pax-web.version>
</properties>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
</dependency>
<dependency> <!-- todo: use tomcat ? -->
<groupId>org.ops4j.pax.web</groupId>
@@ -53,7 +53,7 @@
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
- <version>9.4.22.v20191022</version>
+ <version>9.4.30.v20200611</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
diff --git a/winegrower-cepages/winegrower-cepage-jaxrs/pom.xml b/winegrower-cepages/winegrower-cepage-jaxrs/pom.xml
index 5fa616b..e4c3fd2 100644
--- a/winegrower-cepages/winegrower-cepage-jaxrs/pom.xml
+++ b/winegrower-cepages/winegrower-cepage-jaxrs/pom.xml
@@ -44,12 +44,12 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>1.0.1</version>
+ <version>1.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.aries.component-dsl</groupId>
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/HeaderManifestContributor.java b/winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/HeaderManifestContributor.java
index 1b70bd0..cae4442 100644
--- a/winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/HeaderManifestContributor.java
+++ b/winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/HeaderManifestContributor.java
@@ -14,10 +14,10 @@
package org.apache.winegrower.scanner.manifest;
import static java.util.stream.Collectors.toMap;
-import static org.apache.xbean.asm7.ClassReader.SKIP_CODE;
-import static org.apache.xbean.asm7.ClassReader.SKIP_DEBUG;
-import static org.apache.xbean.asm7.ClassReader.SKIP_FRAMES;
-import static org.apache.xbean.asm7.Opcodes.ASM7;
+import static org.apache.xbean.asm8.ClassReader.SKIP_CODE;
+import static org.apache.xbean.asm8.ClassReader.SKIP_DEBUG;
+import static org.apache.xbean.asm8.ClassReader.SKIP_FRAMES;
+import static org.apache.xbean.asm8.Opcodes.ASM8;
import java.io.InputStream;
import java.lang.annotation.Annotation;
@@ -31,9 +31,9 @@
import java.util.jar.Manifest;
import java.util.stream.Stream;
-import org.apache.xbean.asm7.AnnotationVisitor;
-import org.apache.xbean.asm7.ClassReader;
-import org.apache.xbean.asm7.ClassVisitor;
+import org.apache.xbean.asm8.AnnotationVisitor;
+import org.apache.xbean.asm8.ClassReader;
+import org.apache.xbean.asm8.ClassVisitor;
import org.apache.xbean.finder.AnnotationFinder;
public class HeaderManifestContributor implements ManifestContributor {
@@ -80,7 +80,7 @@
try (final InputStream stream = loader.getResourceAsStream(clazz.getName().replace('.', '/') + ".class")) {
final ClassReader reader = new ClassReader(stream);
final Collection<KeyValue> headers = new ArrayList<>();
- final Supplier<AnnotationVisitor> newHeaderVisitor = () -> new AnnotationVisitor(ASM7) {
+ final Supplier<AnnotationVisitor> newHeaderVisitor = () -> new AnnotationVisitor(ASM8) {
private final KeyValue header = new KeyValue();
@Override
@@ -103,7 +103,7 @@
}
};
- reader.accept(new ClassVisitor(ASM7) {
+ reader.accept(new ClassVisitor(ASM8) {
@Override
public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
switch (descriptor) {
@@ -140,7 +140,7 @@
private final Supplier<AnnotationVisitor> visitor;
private PluralAnnotationVisitor(final String singular, final Supplier<AnnotationVisitor> nestedVisitor) {
- super(ASM7);
+ super(ASM8);
this.visitor = nestedVisitor;
this.singular = singular;
}
@@ -149,7 +149,7 @@
public AnnotationVisitor visitArray(final String name) {
switch (name) {
case "value":
- return new AnnotationVisitor(ASM7) {
+ return new AnnotationVisitor(ASM8) {
@Override
public AnnotationVisitor visitAnnotation(final String name, final String descriptor) {
if (singular.equals(descriptor)) {
diff --git a/winegrower-core/src/test/java/org/apache/winegrower/RipenerTest.java b/winegrower-core/src/test/java/org/apache/winegrower/RipenerTest.java
index 9845a30..6e09724 100644
--- a/winegrower-core/src/test/java/org/apache/winegrower/RipenerTest.java
+++ b/winegrower-core/src/test/java/org/apache/winegrower/RipenerTest.java
@@ -86,13 +86,13 @@
@Test
@WithRipener
void ensureFrameworkBundle(@Service final Ripener ripener) {
- assertEquals(4, ripener.getRegistry().getBundles().size());
+ assertEquals(10, ripener.getRegistry().getBundles().size());
}
@Test
@WithRipener(includeResources = @Entry(path = "org.apache.winegrower.test.implicitactivator"))
void implicitActivator(@Service final Ripener ripener) {
- assertEquals(5, ripener.getRegistry().getBundles().size());
+ assertEquals(11, ripener.getRegistry().getBundles().size());
final BundleActivatorHandler activatorHandler = ripener.getRegistry().getBundles().values().stream()
.filter(it -> it.getActivator() != null)
@@ -110,7 +110,7 @@
@Test
@WithRipener(includeResources = @Entry(path = "org.apache.winegrower.test.simpleactivator"))
void simpleActivator(@Service final Ripener ripener) {
- assertEquals(5, ripener.getRegistry().getBundles().size());
+ assertEquals(11, ripener.getRegistry().getBundles().size());
final BundleActivatorHandler activatorHandler = ripener.getRegistry().getBundles().values().stream()
.filter(it -> it.getActivator() != null)
diff --git a/winegrower-documentation/pom.xml b/winegrower-documentation/pom.xml
index 0d9d6c8..a40d883 100644
--- a/winegrower-documentation/pom.xml
+++ b/winegrower-documentation/pom.xml
@@ -32,7 +32,7 @@
<properties>
<documentation.theme.url>scm:git:https://github.com/apache/karaf-decanter.git</documentation.theme.url>
- <groovy.version>2.5.3</groovy.version>
+ <groovy.version>3.0.5</groovy.version>
</properties>
<build>
@@ -52,7 +52,7 @@
<checkoutDirectory>${project.basedir}/.asciidoctor/theme</checkoutDirectory>
<connectionUrl>${documentation.theme.url}</connectionUrl>
<developerConnectionUrl>${documentation.theme.url}</developerConnectionUrl>
- <tagBase>decanter-2.1.0</tagBase>
+ <tagBase>decanter-2.5.0</tagBase>
<skipCheckoutIfExists>true</skipCheckoutIfExists>
</configuration>
</execution>
@@ -86,12 +86,12 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
- <version>1.5.7</version>
+ <version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>4.9.2.201712150930-r</version>
+ <version>5.8.1.202007141445-r</version>
</dependency>
</dependencies>
</plugin>
diff --git a/winegrower-examples/jaxrs-whiteboard/pom.xml b/winegrower-examples/jaxrs-whiteboard/pom.xml
index 0ac7c10..7e43bd5 100644
--- a/winegrower-examples/jaxrs-whiteboard/pom.xml
+++ b/winegrower-examples/jaxrs-whiteboard/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.14</version>
+ <version>2.1.20</version>
</dependency>
</dependencies>
diff --git a/winegrower-extension/winegrower-agent/pom.xml b/winegrower-extension/winegrower-agent/pom.xml
index 5667c16..ad1f6b2 100644
--- a/winegrower-extension/winegrower-agent/pom.xml
+++ b/winegrower-extension/winegrower-agent/pom.xml
@@ -34,8 +34,6 @@
<winegrower.build.name>${winegrower.build.name.base}.extension.agent</winegrower.build.name>
</properties>
-
-
<dependencies>
<dependency>
<groupId>org.apache.winegrower</groupId>
@@ -54,7 +52,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.14</version>
+ <version>2.1.20</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/winegrower-extension/winegrower-build/winegrower-build-common/pom.xml b/winegrower-extension/winegrower-build/winegrower-build-common/pom.xml
index 0731cc1..a8ffb43 100644
--- a/winegrower-extension/winegrower-build/winegrower-build-common/pom.xml
+++ b/winegrower-extension/winegrower-build/winegrower-build-common/pom.xml
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.19</version>
+ <version>1.20</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm7-shaded</artifactId>
+ <artifactId>xbean-asm8-shaded</artifactId>
<version>${xbean.version}</version>
</dependency>
<dependency>
diff --git a/winegrower-extension/winegrower-build/winegrower-maven-plugin/pom.xml b/winegrower-extension/winegrower-build/winegrower-maven-plugin/pom.xml
index be2e44e..e3cc078 100644
--- a/winegrower-extension/winegrower-build/winegrower-maven-plugin/pom.xml
+++ b/winegrower-extension/winegrower-build/winegrower-maven-plugin/pom.xml
@@ -32,8 +32,8 @@
<packaging>maven-plugin</packaging>
<properties>
- <maven.version>3.5.0</maven.version>
- <maven-plugin-plugin.version>3.5.2</maven-plugin-plugin.version>
+ <maven.version>3.6.3</maven.version>
+ <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
<winegrower.build.name>${winegrower.build.name.base}.extension.build.maven</winegrower.build.name>
</properties>
diff --git a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/RunMojo.java b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/RunMojo.java
new file mode 100644
index 0000000..c344bae
--- /dev/null
+++ b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/RunMojo.java
@@ -0,0 +1,22 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 org.apache.winegrower.extension.build.maven;
+
+import org.apache.maven.plugins.annotations.Mojo;
+
+import static org.apache.maven.plugins.annotations.ResolutionScope.RUNTIME_PLUS_SYSTEM;
+
+@Mojo(name = "run", requiresDependencyResolution = RUNTIME_PLUS_SYSTEM)
+public class RunMojo extends PourMojo {
+}
diff --git a/winegrower-extension/winegrower-cdi/pom.xml b/winegrower-extension/winegrower-cdi/pom.xml
index b33f516..04bb429 100644
--- a/winegrower-extension/winegrower-cdi/pom.xml
+++ b/winegrower-extension/winegrower-cdi/pom.xml
@@ -38,19 +38,19 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-se</artifactId>
- <version>2.0.12</version>
+ <version>2.0.17</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/winegrower-extension/winegrower-servlet/pom.xml b/winegrower-extension/winegrower-servlet/pom.xml
index 463e5e0..d6e1e38 100644
--- a/winegrower-extension/winegrower-servlet/pom.xml
+++ b/winegrower-extension/winegrower-servlet/pom.xml
@@ -33,14 +33,14 @@
<properties>
<winegrower.build.name>${winegrower.build.name.base}.extension.servlet</winegrower.build.name>
- <meecrowave.version>1.2.3</meecrowave.version>
+ <meecrowave.version>1.2.9</meecrowave.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>9.0.10</version>
+ <version>9.0.33</version>
<scope>provided</scope>
</dependency>
@@ -54,7 +54,7 @@
<dependency> <!-- for java 11 -->
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>2.0.7</version>
+ <version>2.0.17</version>
</dependency>
<dependency>
<groupId>org.apache.meecrowave</groupId>
