You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/01/15 13:37:35 UTC
[maven-doxia] branch DOXIA-638 updated (ac8ead4 -> f994e48)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch DOXIA-638
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git.
omit ac8ead4 [DOXIA-638] Replace Plexus Container Default with Sisu Plexus Shim
new f994e48 [DOXIA-638] Replace Plexus Container Default with Sisu Plexus Shim
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ac8ead4)
\
N -- N -- N refs/heads/DOXIA-638 (f994e48)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
doxia-core/pom.xml | 6 ++++++
doxia-modules/doxia-module-apt/pom.xml | 6 ++++++
doxia-modules/doxia-module-fml/pom.xml | 6 ++++++
doxia-modules/doxia-module-markdown/pom.xml | 6 ++++++
doxia-modules/doxia-module-xdoc/pom.xml | 6 ++++++
doxia-modules/doxia-module-xhtml/pom.xml | 6 ++++++
doxia-modules/doxia-module-xhtml5/pom.xml | 6 ++++++
pom.xml | 7 +++++++
8 files changed, 49 insertions(+)
[maven-doxia] 01/01: [DOXIA-638] Replace Plexus Container Default with Sisu Plexus Shim
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-638
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit f994e4879b1812a794581eb0173a3d059669de2f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 8 18:59:00 2022 +0100
[DOXIA-638] Replace Plexus Container Default with Sisu Plexus Shim
This closes #86
---
doxia-core/pom.xml | 10 ++++++++--
doxia-modules/doxia-module-apt/pom.xml | 6 ++++++
doxia-modules/doxia-module-fml/pom.xml | 6 ++++++
doxia-modules/doxia-module-markdown/pom.xml | 6 ++++++
doxia-modules/doxia-module-xdoc/pom.xml | 6 ++++++
doxia-modules/doxia-module-xhtml/pom.xml | 6 ++++++
doxia-modules/doxia-module-xhtml5/pom.xml | 6 ++++++
pom.xml | 15 +++++++++++----
8 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
index db4b7e6..450479f 100644
--- a/doxia-core/pom.xml
+++ b/doxia-core/pom.xml
@@ -47,8 +47,14 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>no_aop</classifier>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml
index 15e2463..97f808b 100644
--- a/doxia-modules/doxia-module-apt/pom.xml
+++ b/doxia-modules/doxia-module-apt/pom.xml
@@ -51,6 +51,12 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>no_aop</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<scope>test</scope>
diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
index 3cca1c1..d641365 100644
--- a/doxia-modules/doxia-module-fml/pom.xml
+++ b/doxia-modules/doxia-module-fml/pom.xml
@@ -46,6 +46,12 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>no_aop</classifier>
+ <optional>true</optional>
+ </dependency>
<!-- test -->
<dependency>
diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml
index c696681..8ef0c0e 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -73,6 +73,12 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>no_aop</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml
index 5f922d6..09b6883 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
@@ -46,6 +46,12 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>no_aop</classifier>
+ <optional>true</optional>
+ </dependency>
<!-- test -->
<dependency>
diff --git a/doxia-modules/doxia-module-xhtml/pom.xml b/doxia-modules/doxia-module-xhtml/pom.xml
index d60be28..288ab20 100644
--- a/doxia-modules/doxia-module-xhtml/pom.xml
+++ b/doxia-modules/doxia-module-xhtml/pom.xml
@@ -47,6 +47,12 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>no_aop</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<scope>test</scope>
diff --git a/doxia-modules/doxia-module-xhtml5/pom.xml b/doxia-modules/doxia-module-xhtml5/pom.xml
index 49704f3..a0afc68 100644
--- a/doxia-modules/doxia-module-xhtml5/pom.xml
+++ b/doxia-modules/doxia-module-xhtml5/pom.xml
@@ -47,6 +47,12 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <classifier>no_aop</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 4fef5e1..51ce85e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,7 @@ under the License.
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,MethodName,InnerAssignment,MagicNumber</checkstyle.violation.ignore>
<project.build.outputTimestamp>2021-11-28T20:51:17Z</project.build.outputTimestamp>
<slf4jVersion>1.7.32</slf4jVersion>
+ <guice.version>3.2.6</guice.version>
</properties>
<dependencyManagement>
@@ -163,14 +164,20 @@ under the License.
<!-- Plexus -->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>2.1.0</version>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <version>0.3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>4.2.2</version>
+ <classifier>no_aop</classifier>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>