[Git][java-team/plexus-containers][master] 4 commits: New upstream version 2.1.1
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Mon May 2 17:59:34 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / plexus-containers
Commits:
dd8b74e6 by Emmanuel Bourg at 2022-05-02T18:56:00+02:00
New upstream version 2.1.1
- - - - -
2eda5168 by Emmanuel Bourg at 2022-05-02T18:57:27+02:00
Standards-Version updated to 4.6.0.1
- - - - -
02559d78 by Emmanuel Bourg at 2022-05-02T18:57:27+02:00
Update upstream source from tag 'upstream/2.1.1'
Update to upstream version '2.1.1'
with Debian dir 5b243007c6bd2769a67812c6171155a6ccf0747c
- - - - -
4833de60 by Emmanuel Bourg at 2022-05-02T18:59:16+02:00
New upstream release (2.1.1)
- - - - -
19 changed files:
- + .github/dependabot.yml
- + .github/workflows/maven.yml
- − .travis.yml
- README.md
- ReleaseNotes.md
- debian/changelog
- debian/control
- plexus-component-annotations/pom.xml
- plexus-component-metadata/pom.xml
- plexus-component-metadata/src/it/annotation-processing-test/pom.xml
- plexus-component-metadata/src/it/descriptor-1/pom.xml
- plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusDescriptorMojo.java
- plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusTestDescriptorMojo.java
- plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
- plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/AnnotationComponentGleaner.java
- plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java
- plexus-container-default/pom.xml
- plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java
- pom.xml
Changes:
=====================================
.github/dependabot.yml
=====================================
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
+
=====================================
.github/workflows/maven.yml
=====================================
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+name: Java CI
+
+on:
+ push:
+ branches-ignore:
+ - dependabot/**
+ pull_request:
+
+jobs:
+ build:
+ name: Verify
+ uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml at v1
=====================================
.travis.yml deleted
=====================================
@@ -1,22 +0,0 @@
-language: java
-jdk:
- - openjdk7
- - oraclejdk8
- - openjdk11
-
-dist: trusty
-
-# No need for preliminary install step.
-install: true
-#
-# Run all integration tests.
-script:
- - "mvn --show-version --errors --batch-mode clean verify -Prun-its"
-#
-cache:
- directories:
- - $HOME/.m2
-branches:
- except:
- - gh-pages
-
=====================================
README.md
=====================================
@@ -1,8 +1,7 @@
Plexus Containers
============
-[](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.plexus%22%20a%3A%plexus-containers%22)
-[](https://travis-ci.org/codehaus-plexus/plexus-containers)
+[](https://search.maven.org/artifact/org.codehaus.plexus/plexus-containers)
Plexus IoC Container core with companion tools.
@@ -14,6 +13,7 @@ We have changed the default branch in GitHub repository from `plexus-containers-
You can find details about the different releases in the [Release Notes](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md).
+ * [Release 2.1.1](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md#plexus-containers-211).
* [Release 2.1.0](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md#plexus-containers-210).
* [Release 2.0.0](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md#plexus-containers-200).
=====================================
ReleaseNotes.md
=====================================
@@ -1,6 +1,15 @@
Plexus Containers Release Notes
=========================
+Plexus Containers 2.1.1
+---------------------
+Plexus Containers 2.1.1 requires Java 7 and Maven 3.2.5+
+
+### Improvements
+
+* Upgrade ASM to 9.2
+* Upgrade JDOM2 to 2.0.6.1
+
Plexus Containers 2.1.0
---------------------
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+plexus-containers (2.1.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ * Standards-Version updated to 4.6.0.1
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 02 May 2022 18:58:57 +0200
+
plexus-containers (2.1.0-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -18,7 +18,7 @@ Build-Depends:
libqdox2-java,
libxbean-reflect-java,
maven-debian-helper
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0.1
Vcs-Git: https://salsa.debian.org/java-team/plexus-containers.git
Vcs-Browser: https://salsa.debian.org/java-team/plexus-containers
Homepage: https://github.com/codehaus-plexus/plexus-containers
=====================================
plexus-component-annotations/pom.xml
=====================================
@@ -7,7 +7,7 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-containers</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</parent>
<artifactId>plexus-component-annotations</artifactId>
=====================================
plexus-component-metadata/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-containers</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</parent>
<artifactId>plexus-component-metadata</artifactId>
@@ -39,25 +39,28 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>7.0</version>
+ <version>9.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.4</version>
+ <version>3.6.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -68,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.5</version>
+ <version>3.6.2</version>
</plugin>
</plugins>
</pluginManagement>
@@ -98,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>2.0.0</version>
+ <version>3.2.2</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
=====================================
plexus-component-metadata/src/it/annotation-processing-test/pom.xml
=====================================
@@ -14,7 +14,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -30,8 +30,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
- <source>1.6</source>
- <target>1.6</target>
+ <source>7</source>
+ <target>7</target>
</configuration>
</plugin>
<plugin>
=====================================
plexus-component-metadata/src/it/descriptor-1/pom.xml
=====================================
@@ -39,8 +39,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>7</source>
+ <target>7</target>
</configuration>
</plugin>
=====================================
plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusDescriptorMojo.java
=====================================
@@ -29,7 +29,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.codehaus.plexus.metadata.MetadataGenerationRequest;
/**
- * Generates a Plexus <tt>components.xml</tt> component descriptor file from source (javadoc) or
+ * Generates a Plexus {@code components.xml} component descriptor file from source (javadoc) or
* class annotations and manually crafted descriptor files.
*
* @author Jason van Zyl
=====================================
plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusTestDescriptorMojo.java
=====================================
@@ -29,7 +29,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.codehaus.plexus.metadata.MetadataGenerationRequest;
/**
- * Generates a Plexus <tt>components.xml</tt> component descriptor file from test source (javadoc)
+ * Generates a Plexus {@code components.xml} component descriptor file from test source (javadoc)
* or test class annotations and manually crafted descriptor files.
*
* @author Jason van Zyl
=====================================
plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
=====================================
@@ -35,7 +35,7 @@ public class AnnReader extends ClassVisitor {
private final AnnClass annClass;
private AnnReader(AnnClass annClass) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM9);
this.annClass = annClass;
}
@@ -64,7 +64,7 @@ public class AnnReader extends ClassVisitor {
public FieldVisitor visitField(int access, final String name, final String desc, String signature, Object value) {
final AnnField field = new AnnField(annClass, access, name, desc);
annClass.addField(field);
- return new FieldVisitor(Opcodes.ASM7) {
+ return new FieldVisitor(Opcodes.ASM9) {
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
Ann ann = new Ann(desc);
@@ -79,7 +79,7 @@ public class AnnReader extends ClassVisitor {
final AnnMethod method = new AnnMethod(annClass, access, mname, mdesc);
annClass.addMethod(method);
- return new MethodVisitor(Opcodes.ASM7) {
+ return new MethodVisitor(Opcodes.ASM9) {
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
Ann ann = new Ann(desc);
@@ -99,7 +99,7 @@ public class AnnReader extends ClassVisitor {
private Ann ann;
public AnnAnnReader(Ann ann) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM9);
this.ann = ann;
}
@@ -132,7 +132,7 @@ public class AnnReader extends ClassVisitor {
private ArrayList<String> array = new ArrayList<String>();
public AnnAnnArrayReader(Ann ann, String name) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM9);
this.ann = ann;
this.name = name;
}
=====================================
plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/AnnotationComponentGleaner.java
=====================================
@@ -39,7 +39,7 @@ import org.codehaus.plexus.metadata.ann.AnnReader;
import org.codehaus.plexus.util.IOUtil;
/**
- * A class component gleaner which inspects each type for <tt>org.codehaus.plexus.component.annotations.*</tt> annotations
+ * A class component gleaner which inspects each type for {@code org.codehaus.plexus.component.annotations.*} annotations
* and when found translates them into a {@link ComponentDescriptor}.
*
*/
=====================================
plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java
=====================================
@@ -42,6 +42,9 @@ import org.xml.sax.helpers.DefaultHandler;
public class Driver implements Locator, XMLReader, Attributes
{
+ protected static final String EXTERNAL_GENERAL_ENTITIES_PROPERTY =
+ "http://xml.org/sax/features/external-general-entities";
+
protected static final String DECLARATION_HANDLER_PROPERTY =
"http://xml.org/sax/properties/declaration-handler";
@@ -200,6 +203,8 @@ public class Driver implements Locator, XMLReader, Attributes
}
} else if(VALIDATION_FEATURE.equals(name)) {
pp.setFeature(XmlPullParser.FEATURE_VALIDATION, value);
+ } else if(EXTERNAL_GENERAL_ENTITIES_PROPERTY.equals(name)) {
+ // ignore
} else {
pp.setFeature(name, value);
//throw new SAXNotRecognizedException("unrecognized feature "+name);
=====================================
plexus-container-default/pom.xml
=====================================
@@ -4,7 +4,7 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-containers</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</parent>
<artifactId>plexus-container-default</artifactId>
@@ -27,10 +27,6 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
=====================================
plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java
=====================================
@@ -20,10 +20,13 @@ import static org.codehaus.plexus.component.CastUtils.isAssignableFrom;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -37,10 +40,6 @@ import org.codehaus.plexus.component.composition.DefaultCompositionResolver;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-
/**
* @author Jason van Zyl
*/
@@ -48,7 +47,8 @@ public class DefaultComponentRepository
extends AbstractLogEnabled
implements ComponentRepository
{
- private final Map<ClassRealm, SortedMap<String, Multimap<String, ComponentDescriptor<?>>>> index = new LinkedHashMap<ClassRealm, SortedMap<String, Multimap<String, ComponentDescriptor<?>>>>();
+ private final Map<ClassRealm, SortedMap<String, Map<String, Set<ComponentDescriptor<?>>>>> index =
+ new LinkedHashMap<ClassRealm, SortedMap<String, Map<String, Set<ComponentDescriptor<?>>>>>();
private final CompositionResolver compositionResolver = new DefaultCompositionResolver();
@@ -60,7 +60,7 @@ public class DefaultComponentRepository
// Accessors
// ----------------------------------------------------------------------
- private Multimap<String, ComponentDescriptor<?>> getComponentDescriptors( String role )
+ private Map<String, Set<ComponentDescriptor<?>>> getComponentDescriptors( String role )
{
// verify arguments
if ( role == null )
@@ -77,24 +77,35 @@ public class DefaultComponentRepository
// Get all valid component descriptors
- Multimap<String, ComponentDescriptor<?>> roleHintIndex = LinkedHashMultimap.create();
+ Map<String, Set<ComponentDescriptor<?>>> roleHintIndex =
+ new LinkedHashMap<String, Set<ComponentDescriptor<?>>>();
for ( ClassRealm realm : realms )
{
- SortedMap<String, Multimap<String, ComponentDescriptor<?>>> roleIndex = index.get( realm );
+ SortedMap<String, Map<String, Set<ComponentDescriptor<?>>>> roleIndex = index.get( realm );
if (roleIndex != null) {
- Multimap<String, ComponentDescriptor<?>> descriptors = roleIndex.get( role );
+ Map<String, Set<ComponentDescriptor<?>>> descriptors = roleIndex.get( role );
if ( descriptors != null )
{
- roleHintIndex.putAll( descriptors );
+ for ( Entry<String, Set<ComponentDescriptor<?>>> descriptor : descriptors.entrySet() )
+ {
+ Set<ComponentDescriptor<?>> componentDescriptors = roleHintIndex.get( descriptor.getKey() );
+ if ( componentDescriptors == null )
+ {
+ componentDescriptors = new LinkedHashSet<ComponentDescriptor<?>>();
+ roleHintIndex.put( descriptor.getKey(), componentDescriptors );
+ }
+ componentDescriptors.addAll( descriptor.getValue() );
+ }
+
}
}
}
- return Multimaps.unmodifiableMultimap( roleHintIndex );
+ return Collections.unmodifiableMap( roleHintIndex );
}
public <T> ComponentDescriptor<T> getComponentDescriptor( Class<T> type, String role, String roleHint )
{
- Multimap<String, ComponentDescriptor<?>> roleHintIndex = getComponentDescriptors( role );
+ Map<String, Set<ComponentDescriptor<?>>> roleHintIndex = getComponentDescriptors( role );
Collection<ComponentDescriptor<?>> descriptors;
@@ -126,16 +137,15 @@ public class DefaultComponentRepository
descriptors = allDescriptors;
}
- for ( ComponentDescriptor<?> descriptor : descriptors )
+ if ( descriptors!= null )
{
- Class<?> implClass = descriptor.getImplementationClass();
- if ( isAssignableFrom( type, implClass ) )
- {
- return (ComponentDescriptor<T>) descriptor;
- }
- else if ( Object.class == implClass && role.equals( type.getName() ) )
+ for ( ComponentDescriptor<?> descriptor : descriptors )
{
- return (ComponentDescriptor<T>) descriptor;
+ Class<?> implClass = descriptor.getImplementationClass();
+ if ( isAssignableFrom( type, implClass ) || Object.class == implClass && role.equals( type.getName() ) )
+ {
+ return (ComponentDescriptor<T>) descriptor;
+ }
}
}
@@ -145,11 +155,12 @@ public class DefaultComponentRepository
public <T> Map<String, ComponentDescriptor<T>> getComponentDescriptorMap( Class<T> type, String role )
{
Map<String, ComponentDescriptor<T>> descriptors = new TreeMap<String, ComponentDescriptor<T>>();
- for ( ComponentDescriptor<?> descriptor : getComponentDescriptors( role ).values() )
+ for ( Set<ComponentDescriptor<?>> componentDescriptors : getComponentDescriptors( role ).values() )
{
- if ( !descriptors.containsKey( descriptor.getRoleHint() ) )
+ for ( ComponentDescriptor<?> descriptor : componentDescriptors )
{
- if ( isAssignableFrom( type, descriptor.getImplementationClass() ) )
+ if ( !descriptors.containsKey( descriptor.getRoleHint() ) && isAssignableFrom( type,
+ descriptor.getImplementationClass() ) )
{
descriptors.put( descriptor.getRoleHint(), (ComponentDescriptor<T>) descriptor );
}
@@ -161,11 +172,14 @@ public class DefaultComponentRepository
public <T> List<ComponentDescriptor<T>> getComponentDescriptorList( Class<T> type, String role )
{
List<ComponentDescriptor<T>> descriptors = new ArrayList<ComponentDescriptor<T>>();
- for ( ComponentDescriptor<?> descriptor : getComponentDescriptors( role ).values() )
+ for ( Set<ComponentDescriptor<?>> componentDescriptors : getComponentDescriptors( role ).values() )
{
- if ( isAssignableFrom( type, descriptor.getImplementationClass() ) )
+ for ( ComponentDescriptor<?> descriptor : componentDescriptors )
{
- descriptors.add( (ComponentDescriptor<T>) descriptor );
+ if ( isAssignableFrom( type, descriptor.getImplementationClass() ) )
+ {
+ descriptors.add( (ComponentDescriptor<T>) descriptor );
+ }
}
}
return descriptors;
@@ -211,20 +225,27 @@ public class DefaultComponentRepository
throws CycleDetectedInComponentGraphException
{
ClassRealm classRealm = componentDescriptor.getRealm();
- SortedMap<String, Multimap<String, ComponentDescriptor<?>>> roleIndex = index.get( classRealm );
+ SortedMap<String, Map<String, Set<ComponentDescriptor<?>>>> roleIndex = index.get( classRealm );
if (roleIndex == null) {
- roleIndex = new TreeMap<String, Multimap<String, ComponentDescriptor<?>>>();
+ roleIndex = new TreeMap<String, Map<String, Set<ComponentDescriptor<?>>>>();
index.put(classRealm, roleIndex);
}
String role = componentDescriptor.getRole();
- Multimap<String, ComponentDescriptor<?>> roleHintIndex = roleIndex.get( role );
+ Map<String, Set<ComponentDescriptor<?>>> roleHintIndex = roleIndex.get( role );
if ( roleHintIndex == null )
{
- roleHintIndex = LinkedHashMultimap.create();
+ roleHintIndex = new LinkedHashMap<String, Set<ComponentDescriptor<?>>>();
roleIndex.put( role, roleHintIndex );
}
- roleHintIndex.put( componentDescriptor.getRoleHint(), componentDescriptor );
+ String roleHint = componentDescriptor.getRoleHint();
+ Set<ComponentDescriptor<?>> componentDescriptors = roleHintIndex.get( roleHint );
+ if ( componentDescriptors == null )
+ {
+ componentDescriptors = new LinkedHashSet<ComponentDescriptor<?>>();
+ roleHintIndex.put( roleHint, componentDescriptors );
+ }
+ componentDescriptors.add(componentDescriptor);
compositionResolver.addComponentDescriptor( componentDescriptor );
}
=====================================
pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId>
- <version>5.1</version>
+ <version>6.5</version>
</parent>
<artifactId>plexus-containers</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<packaging>pom</packaging>
<name>Plexus Containers</name>
@@ -25,9 +25,9 @@
<scm>
<connection>scm:git:https://github.com/codehaus-plexus/plexus-containers.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/codehaus-plexus/plexus-containers.git</developerConnection>
+ <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.0</tag>
+ <tag>plexus-containers-2.1.1</tag>
</scm>
<issueManagement>
<system>github</system>
@@ -45,8 +45,9 @@
<classWorldsVersion>2.6.0</classWorldsVersion>
<plexusUtilsVersion>3.1.1</plexusUtilsVersion>
<xbeanReflectVersion>3.7</xbeanReflectVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javaVersion>6</javaVersion>
+ <javaVersion>7</javaVersion>
</properties>
<dependencyManagement>
@@ -84,38 +85,32 @@
<dependency>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
- <version>2.0-M10</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.6</version>
+ <version>2.0.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>provided</scope>
+ <version>4.13.2</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -123,6 +118,15 @@
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <check>false</check>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -131,6 +135,31 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.1.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.1.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-resources</artifactId>
+ <version>4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
View it on GitLab: https://salsa.debian.org/java-team/plexus-containers/-/compare/79b1d3ceb682159e1a409cad71898e7ef9d535e5...4833de60bf84bb07a2c1aa109bfc441b8438d3cc
--
View it on GitLab: https://salsa.debian.org/java-team/plexus-containers/-/compare/79b1d3ceb682159e1a409cad71898e7ef9d535e5...4833de60bf84bb07a2c1aa109bfc441b8438d3cc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220502/ba9cbc75/attachment.htm>
More information about the pkg-java-commits
mailing list