New Upstream Snapshot - plexus-containers
Ready changes
Summary
Merged new upstream version: 2.1.1+git20220502.1.06bec28 (was: 2.1.1).
Resulting package
Built on 2022-05-03T01:03 (took 10m44s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libplexus-component-annotations-javaapt install -t fresh-snapshots libplexus-component-metadata-javaapt install -t fresh-snapshots libplexus-container-default-javaapt install -t fresh-snapshots libplexus-container-default1.5-java
Lintian Result
- libplexus-component-annotations-java_2.1.1+git20220502.1.06bec28-1~jan+nus1_all.deb
- libplexus-component-metadata-java_2.1.1+git20220502.1.06bec28-1~jan+nus1_all.deb
- libplexus-container-default-java_2.1.1+git20220502.1.06bec28-1~jan+nus1_all.deb
- libplexus-container-default1.5-java_2.1.1+git20220502.1.06bec28-1~jan+nus1_all.deb
- plexus-containers_2.1.1+git20220502.1.06bec28-1~jan+nus1.dsc
- plexus-containers_2.1.1+git20220502.1.06bec28-1~jan+nus1_amd64.buildinfo
- plexus-containers_2.1.1+git20220502.1.06bec28-1~jan+nus1_amd64.changes
Diff
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 41d662d..d0724b8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -14,15 +14,12 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-name: Java CI
-on:
- push:
- branches-ignore:
- - dependabot/**
- pull_request:
+name: GitHub CI
+
+on: [push, pull_request]
jobs:
build:
name: Verify
- uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v1
+ uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
diff --git a/README.md b/README.md
index f1d1707..22f7c87 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
-Plexus Containers
+Plexus Containers (deprecated)
============
[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-containers.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-containers)
Plexus IoC Container core with companion tools.
+## Deprecated
+
+Plexus IoC Container is replaced by [Eclipse Sisu](https://www.eclipse.org/sisu/).
+
## Attention
We have changed the default branch in GitHub repository from `plexus-containers-1.x` to `master`
diff --git a/debian/changelog b/debian/changelog
index 52adc27..6e88e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plexus-containers (2.1.1+git20220502.1.06bec28-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 03 May 2022 00:57:05 -0000
+
plexus-containers (2.1.1-1) unstable; urgency=medium
* Team upload.
diff --git a/plexus-component-annotations/pom.xml b/plexus-component-annotations/pom.xml
index d001565..9ecdafa 100644
--- a/plexus-component-annotations/pom.xml
+++ b/plexus-component-annotations/pom.xml
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-containers</artifactId>
- <version>2.1.1</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>plexus-component-annotations</artifactId>
- <name>Plexus :: Component Annotations</name>
+ <name>Plexus :: Component Annotations (deprecated)</name>
<description>
Plexus Component "Java 5" Annotations, to describe plexus components properties in java sources with
standard annotations instead of javadoc annotations.
diff --git a/plexus-component-annotations/src/site/apt/index.apt b/plexus-component-annotations/src/site/apt/index.apt
index 017fa8c..01587d7 100644
--- a/plexus-component-annotations/src/site/apt/index.apt
+++ b/plexus-component-annotations/src/site/apt/index.apt
@@ -8,16 +8,21 @@
About Plexus :: Component Annotations
- Plexus Component "Java 5" Annotations, to describe plexus components properties in java sources with standard annotations instead of javadoc annotations.
+ Plexus Component "Java 5" Annotations, to describe Plexus components properties in java sources with standard annotations instead of Javadoc annotations.
3 "Java 5" annotations are provided to replace javadoc annotations:
-*-----------------------------+----------------------+
-| <<old javadoc annotation>> | <<new "Java 5" annotation>> |
-*-----------------------------+----------------------+
-| <<<@plexus.component>>> | {{{./apidocs/org/codehaus/plexus/component/annotations/Component.html}<<<@Component>>>}} |
-*-----------------------------+----------------------+
-| <<<@plexus.requirement>>> | {{{./apidocs/org/codehaus/plexus/component/annotations/Requirement.html}<<<@Requirement>>>}} |
-*-----------------------------+----------------------+
-| <<<@plexus.configuration>>> | {{{./apidocs/org/codehaus/plexus/component/annotations/Configuration.html}<<<@Configuration>>>}} |
-*-----------------------------+----------------------+
+*-----------------------------+------------------------------------+-----------+
+| <<old javadoc annotation>> | <<new Plexus "Java 5" annotation>> | JSR-330 <<<javax.inject>>> target
+*-----------------------------+------------------------------------+-----------+
+| <<<@plexus.component>>> | {{{./apidocs/org/codehaus/plexus/component/annotations/Component.html}<<<@Component>>>}} | {{{https://github.com/eclipse/sisu.plexus/wiki/Plexus-to-JSR330#component}<<<@Named>>> + ...}}
+*-----------------------------+----------------------+-------------+-----------+
+| <<<@plexus.requirement>>> | {{{./apidocs/org/codehaus/plexus/component/annotations/Requirement.html}<<<@Requirement>>>}} | {{{https://github.com/eclipse/sisu.plexus/wiki/Plexus-to-JSR330#requirement}<<<@Inject>>> + ...}}
+*-----------------------------+----------------------+-------------+-----------+
+| <<<@plexus.configuration>>> | {{{./apidocs/org/codehaus/plexus/component/annotations/Configuration.html}<<<@Configuration>>>}} | {{{https://github.com/eclipse/sisu.plexus/wiki/Plexus-to-JSR330#configuration}...}}
+*-----------------------------+----------------------+-------------+-----------+
+
+* Deprecated
+
+ Once using {{{https://www.eclipse.org/sisu/}Eclipse Sisu}} instead of {{{../plexus-default-container/}Plexus Default Container}},
+ Plexus annotations are expected to be migrated to {{{https://github.com/eclipse/sisu.plexus/wiki/Plexus-to-JSR330}JSR-330 <<<javax.inject>>> annotations}}.
diff --git a/plexus-component-metadata/pom.xml b/plexus-component-metadata/pom.xml
index 482705d..71e9931 100644
--- a/plexus-component-metadata/pom.xml
+++ b/plexus-component-metadata/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-containers</artifactId>
- <version>2.1.1</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>plexus-component-metadata</artifactId>
<packaging>maven-plugin</packaging>
- <name>Plexus :: Component Metadata (Maven Plugin)</name>
+ <name>Plexus :: Component Metadata (Maven Plugin) (deprecated)</name>
<description>A Maven plugin to generate Plexus Components descriptors from source javadoc tags and Java 5 class annotations.</description>
<dependencies>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>9.2</version>
+ <version>9.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.2</version>
+ <version>3.6.4</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.2</version>
+ <version>3.6.4</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/plexus-container-default/pom.xml b/plexus-container-default/pom.xml
index 88b2628..6a7ebf5 100644
--- a/plexus-container-default/pom.xml
+++ b/plexus-container-default/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-containers</artifactId>
- <version>2.1.1</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>plexus-container-default</artifactId>
- <name>Plexus :: Default Container</name>
+ <name>Plexus :: Default Container (deprecated)</name>
<description>
The Plexus IoC container API and its default implementation.
</description>
diff --git a/plexus-container-default/src/site/apt/index.apt b/plexus-container-default/src/site/apt/index.apt
index e2aa402..6288061 100644
--- a/plexus-container-default/src/site/apt/index.apt
+++ b/plexus-container-default/src/site/apt/index.apt
@@ -32,3 +32,9 @@ Overview
programmatically too or extended to read configuration from any source. It is used for example in Maven 2 to
read plugins configuration from <<<META-INF/maven/plugin.xml>>> and instanciate Mojos downloaded from
Maven repositories.
+
+* Deprecated
+
+ <<<plexus-default-container>>> is replaced by {{{https://github.com/eclipse/sisu.inject}Sisu container}}
+ and its {{{https://github.com/eclipse/sisu.plexus}Plexus shim <<<org.eclipse.sisu.plexus>>>}}
+ ({{{https://eclipse.github.io/sisu.plexus/apidocs/reference/packages.html}javadoc}}).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bbe1830..3b4d456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,14 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId>
- <version>6.5</version>
+ <version>8</version>
</parent>
<artifactId>plexus-containers</artifactId>
- <version>2.1.1</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Plexus Containers</name>
+ <name>Plexus Containers (deprecated)</name>
<description>
Plexus IoC Container core with companion tools.
</description>
@@ -26,8 +26,8 @@
<scm>
<connection>scm:git:https://github.com/codehaus-plexus/plexus-containers.git</connection>
<developerConnection>scm:git:https://github.com/codehaus-plexus/plexus-containers.git</developerConnection>
- <url>https://github.com/codehaus-plexus/plexus-containers</url>
- <tag>plexus-containers-2.1.1</tag>
+ <url>https://github.com/codehaus-plexus/plexus-containers/tree/${project.scm.tag}/</url>
+ <tag>master</tag>
</scm>
<issueManagement>
<system>github</system>
@@ -44,7 +44,7 @@
<scm.url>scm:git:git@github.com:codehaus-plexus/plexus-containers.git</scm.url>
<classWorldsVersion>2.6.0</classWorldsVersion>
<plexusUtilsVersion>3.1.1</plexusUtilsVersion>
- <xbeanReflectVersion>3.7</xbeanReflectVersion>
+ <xbeanReflectVersion>4.21</xbeanReflectVersion>
<mavenVersion>3.2.5</mavenVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javaVersion>7</javaVersion>
@@ -142,7 +142,7 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/src/site/apt/history.apt b/src/site/apt/history.apt
index a1d035f..e5448ec 100644
--- a/src/site/apt/history.apt
+++ b/src/site/apt/history.apt
@@ -44,7 +44,9 @@ Plexus Containers Structure History
| 1.0.0 | 2009-06-19 | no structure change, but the long expected 1.0.0 release...
*----------------+--------------+------------------------+
- Notice that Maven 3 uses {{{https://www.eclipse.org/sisu/}Sisu}} as a replacement for Plexus Container:
+* Deprecated
+
+ Maven 3 uses {{{https://www.eclipse.org/sisu/}Sisu}} as a replacement for Plexus Container:
newer releases of Plexus Containers are mainly done for companion tools
<<<{{{./plexus-component-metadata}plexus-component-metadata}}>>> Maven Plugin,
<<<{{{./plexus-component-javadoc}plexus-component-javadoc}}>>> or
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index b09a9a0..db99a70 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -26,4 +26,8 @@ Overview
[]
- <<<plexus-containers>>>' structure has evolved over time: see {{{./history.html}history}} to understand its changes.
\ No newline at end of file
+ <<<plexus-containers>>>' structure has evolved over time: see {{{./history.html}history}} to understand its changes.
+
+* Deprecated
+
+ Plexus Containers is deprecated, replaced by {{{https://www.eclipse.org/sisu/}Eclipse Sisu}}: see each component documentation for more details.
diff --git a/src/site/site.xml b/src/site/site.xml
index c33a516..8c438d2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,9 +1,12 @@
<?xml version="1.0"?>
-<project name="Plexus Container" xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project name="Plexus Container" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
+ <links>
+ <item name="Eclipse Sisu" href="https://projects.eclipse.org/projects/technology.sisu" />
+ </links>
+
<menu ref="modules" />
</body>
</project>
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-component-annotations/2.2.0-SNAPSHOT/plexus-component-annotations-2.2.0-SNAPSHOT.pom -rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-component-metadata/2.2.0-SNAPSHOT/plexus-component-metadata-2.2.0-SNAPSHOT.pom -rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-container-default/2.2.0-SNAPSHOT/plexus-container-default-2.2.0-SNAPSHOT.pom -rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-containers/2.2.0-SNAPSHOT/plexus-containers-2.2.0-SNAPSHOT.pom lrwxrwxrwx root/root /usr/share/java/plexus-component-annotations-2.2.0-SNAPSHOT.jar -> plexus-component-annotations.jar lrwxrwxrwx root/root /usr/share/java/plexus-component-metadata-2.2.0-SNAPSHOT.jar -> plexus-component-metadata.jar lrwxrwxrwx root/root /usr/share/java/plexus-container-default-2.2.0-SNAPSHOT.jar -> plexus-container-default.jar lrwxrwxrwx root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-component-annotations/2.2.0-SNAPSHOT/plexus-component-annotations-2.2.0-SNAPSHOT.jar -> ../../../../../../java/plexus-component-annotations.jar lrwxrwxrwx root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-component-metadata/2.2.0-SNAPSHOT/plexus-component-metadata-2.2.0-SNAPSHOT.jar -> ../../../../../../java/plexus-component-metadata.jar lrwxrwxrwx root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-container-default/2.2.0-SNAPSHOT/plexus-container-default-2.2.0-SNAPSHOT.jar -> ../../../../../../java/plexus-container-default.jar
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-component-annotations/2.1.1/plexus-component-annotations-2.1.1.pom -rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-component-metadata/2.1.1/plexus-component-metadata-2.1.1.pom -rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-container-default/2.1.1/plexus-container-default-2.1.1.pom -rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-containers/2.1.1/plexus-containers-2.1.1.pom lrwxrwxrwx root/root /usr/share/java/plexus-component-annotations-2.1.1.jar -> plexus-component-annotations.jar lrwxrwxrwx root/root /usr/share/java/plexus-component-metadata-2.1.1.jar -> plexus-component-metadata.jar lrwxrwxrwx root/root /usr/share/java/plexus-container-default-2.1.1.jar -> plexus-container-default.jar lrwxrwxrwx root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-component-annotations/2.1.1/plexus-component-annotations-2.1.1.jar -> ../../../../../../java/plexus-component-annotations.jar lrwxrwxrwx root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-component-metadata/2.1.1/plexus-component-metadata-2.1.1.jar -> ../../../../../../java/plexus-component-metadata.jar lrwxrwxrwx root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-container-default/2.1.1/plexus-container-default-2.1.1.jar -> ../../../../../../java/plexus-container-default.jar
No differences were encountered between the control files of package libplexus-component-annotations-java
No differences were encountered between the control files of package libplexus-component-metadata-java
No differences were encountered between the control files of package libplexus-container-default-java
No differences were encountered between the control files of package libplexus-container-default1.5-java