Specifies a comma-separated list of GAV patterns to consider
+ * when looking for updates. If the trailing parts of the GAV are omitted, then can assume any value.
+ *
+ * The wildcard "*" can be used as the only, first, last or both characters in each token.
+ * The version token does support version ranges.
+ *
+ * Examples: {@code "mygroup:artifact:*"}, {@code "mygroup:artifact"}, {@code "mygroup"}
+ *
+ * @since 2.15.0
+ */
+ @Parameter(property = "extensionIncludes", defaultValue = WildcardMatcher.WILDCARD)
+ private List extensionIncludes;
+
+ /**
+ * Specifies a comma-separated list of GAV patterns to NOT consider
+ * when looking for updates. If the trailing parts of the GAV are omitted, then can assume any value.
+ *
+ * This list is taken into account after {@link #extensionIncludes}
.
+ *
+ * The wildcard "*" can be used as the only, first, last or both characters in each token.
+ * The version token does support version ranges.
+ *
+ * Examples: {@code "mygroup:artifact:*"}, {@code "mygroup:artifact"}, {@code "mygroup"}
+ *
+ * @since 2.15.0
+ */
+ @Parameter(property = "extensionExcludes")
+ private List extensionExcludes;
+
+ /**
+ * Whether to allow the major version number to be changed.
+ *
+ * @since 2.15.0
+ */
+ @Parameter(property = "allowMajorUpdates", defaultValue = "true")
+ private boolean allowMajorUpdates = true;
+
+ /**
+ * Whether to allow the minor version number to be changed.
+ *
+ * Note: {@code false} also implies {@linkplain #allowMajorUpdates}
+ * to be {@code false}
+ *
+ * @since 2.15.0
+ */
+ @Parameter(property = "allowMinorUpdates", defaultValue = "true")
+ private boolean allowMinorUpdates = true;
+
+ /**
+ * Whether to allow the incremental version number to be changed.
+ *
+ * Note: {@code false} also implies {@linkplain #allowMajorUpdates}
+ * and {@linkplain #allowMinorUpdates} to be {@code false}
+ *
+ * @since 2.15.0
+ */
+ @Parameter(property = "allowIncrementalUpdates", defaultValue = "true")
+ private boolean allowIncrementalUpdates = true;
+
+ /**
+ * Whether to process core extensions. Default is {@code true}.
+ * @since 2.15.0
+ */
+ @Parameter(property = "processCoreExtensions", defaultValue = "true")
+ private boolean processCoreExtensions = true;
+
+ /**
+ * Whether to process build extensions. Default is {@code true}.
+ * @since 2.15.0
+ */
+ @Parameter(property = "processBuildExtensions", defaultValue = "true")
+ private boolean processBuildExtensions = true;
+
+ /**
+ * If set to {@code false}, the plugin will not interpolate property values when looking for versions
+ * to be changed, but will instead operate on raw model.
+ *
+ * @since 2.15.0
+ */
+ @Parameter(property = "interpolateProperties", defaultValue = "true")
+ protected boolean interpolateProperties = true;
+
+ /**
+ * Whether to show additional information such as extensions that do not need updating. Defaults to false.
+ *
+ * @since 2.15.0
+ */
+ @Parameter(property = "verbose", defaultValue = "false")
+ private boolean verbose;
+
+ @Inject
+ public DisplayExtensionUpdatesMojo(
+ RepositorySystem repositorySystem,
+ org.eclipse.aether.RepositorySystem aetherRepositorySystem,
+ Map wagonMap,
+ Map changeRecorders) {
+ super(repositorySystem, aetherRepositorySystem, wagonMap, changeRecorders);
+ }
+
+ @Override
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ logInit();
+ validateInput();
+
+ if (!processCoreExtensions && !processBuildExtensions) {
+ getLog().info("Neither core nor build extensions are to be processed. Nothing to do.");
+ return;
+ }
+
+ DependencyFilter includeFilter = DependencyFilter.parseFrom(extensionIncludes);
+ DependencyFilter excludeFilter = DependencyFilter.parseFrom(extensionExcludes);
+
+ Set dependencies;
+ try {
+ Stream extensions;
+ if (processCoreExtensions) {
+ extensions = CoreExtensionUtils.getCoreExtensions(project);
+ } else {
+ extensions = Stream.empty();
+ }
+ if (processBuildExtensions) {
+ if (!interpolateProperties) {
+ extensions = Stream.concat(
+ extensions,
+ PomHelper.getChildModels(session.getCurrentProject(), getLog()).values().stream()
+ .map(Model::getBuild)
+ .filter(Objects::nonNull)
+ .map(Build::getExtensions)
+ .map(List::stream)
+ .reduce(Stream::concat)
+ .orElse(Stream.empty()));
+ } else {
+ List rawModels = getRawModels();
+ for (ModelNode node : rawModels) {
+ if (node.getModel() == null) {
+ // unlikely
+ continue;
+ }
+ Map properties = new HashMap<>();
+ for (ModelNode p = node; p != null; p = p.getParent().orElse(null)) {
+ p.getModel()
+ .getProperties()
+ .forEach((key, value) ->
+ properties.putIfAbsent(String.valueOf(key), String.valueOf(value)));
+ }
+ extensions = Stream.concat(
+ extensions,
+ Optional.ofNullable(node.getModel().getBuild())
+ .map(Build::getExtensions)
+ .orElse(Collections.emptyList())
+ .stream()
+ .map(e -> ExtensionBuilder.newBuilder()
+ .withGroupId(PomHelper.evaluate(e.getGroupId(), properties))
+ .withArtifactId(PomHelper.evaluate(e.getArtifactId(), properties))
+ .withVersion(PomHelper.evaluate(e.getVersion(), properties))
+ .build()));
+ }
+ }
+ }
+
+ dependencies = extensions
+ .map(e -> DependencyBuilder.newBuilder()
+ .withGroupId(e.getGroupId())
+ .withArtifactId(e.getArtifactId())
+ .withVersion(e.getVersion())
+ .build())
+ .filter(includeFilter::matchersMatch)
+ .filter(excludeFilter::matchersDontMatch)
+ .collect(Collectors.toSet());
+ } catch (IOException | XmlPullParserException e) {
+ throw new MojoExecutionException(e.getMessage());
+ }
+ if (dependencies.isEmpty()) {
+ getLog().info("Extensions set filtered by include- and extensions-filters is empty. Nothing to do.");
+ return;
+ }
+
+ try {
+ logUpdates(getHelper().lookupDependenciesUpdates(dependencies, true, true, allowSnapshots));
+ } catch (VersionRetrievalException e) {
+ throw new MojoExecutionException(e.getMessage(), e);
+ }
+ }
+
+ private List getRawModels() throws MojoFailureException {
+ List rawModels;
+ try {
+ ModifiedPomXMLEventReader pomReader = newModifiedPomXER(
+ new StringBuilder(
+ new String(Files.readAllBytes(getProject().getFile().toPath()))),
+ getProject().getFile().toPath().toString());
+ ModelNode rootNode = new ModelNode(PomHelper.getRawModel(pomReader), pomReader);
+ rawModels = PomHelper.getRawModelTree(rootNode, getLog());
+ } catch (IOException e) {
+ throw new MojoFailureException(e.getMessage(), e);
+ }
+ return rawModels;
+ }
+
+ private Optional calculateUpdateScope() {
+ return of(SegmentUtils.determineUnchangedSegment(
+ allowMajorUpdates, allowMinorUpdates, allowIncrementalUpdates, getLog())
+ .map(s -> Segment.of(s.value() + 1))
+ .orElse(MAJOR));
+ }
+
+ private void logUpdates(Map updates) {
+ List withUpdates = new ArrayList<>();
+ List usingCurrent = new ArrayList<>();
+ for (ArtifactVersions versions : updates.values()) {
+ String left = " " + ArtifactUtils.versionlessKey(versions.getArtifact()) + " ";
+ final String current;
+ ArtifactVersion latest;
+ if (versions.isCurrentVersionDefined()) {
+ current = versions.getCurrentVersion().toString();
+ latest = versions.getNewestUpdate(calculateUpdateScope(), allowSnapshots);
+ } else {
+ ArtifactVersion newestVersion =
+ versions.getNewestVersion(versions.getArtifact().getVersionRange(), allowSnapshots);
+ current = versions.getArtifact().getVersionRange().toString();
+ latest = newestVersion == null
+ ? null
+ : versions.getNewestUpdate(newestVersion, calculateUpdateScope(), allowSnapshots);
+ if (latest != null
+ && ArtifactVersions.isVersionInRange(
+ latest, versions.getArtifact().getVersionRange())) {
+ latest = null;
+ }
+ }
+ String right = " " + (latest == null ? current : current + " -> " + latest);
+ List t = latest == null ? usingCurrent : withUpdates;
+ if (right.length() + left.length() + 3 > INFO_PAD_SIZE + getOutputLineWidthOffset()) {
+ t.add(left + "...");
+ t.add(StringUtils.leftPad(right, INFO_PAD_SIZE + getOutputLineWidthOffset()));
+
+ } else {
+ t.add(StringUtils.rightPad(left, INFO_PAD_SIZE + getOutputLineWidthOffset() - right.length(), ".")
+ + right);
+ }
+ }
+
+ if (verbose) {
+ if (usingCurrent.isEmpty()) {
+ if (!withUpdates.isEmpty()) {
+ logLine(false, "No extensions are using the newest version.");
+ logLine(false, "");
+ }
+ } else {
+ logLine(false, "The following extensions are using the newest version:");
+ for (String s : usingCurrent) {
+ logLine(false, s);
+ }
+ logLine(false, "");
+ }
+ }
+
+ if (withUpdates.isEmpty()) {
+ if (!usingCurrent.isEmpty()) {
+ logLine(false, "No extensions have newer versions.");
+ logLine(false, "");
+ }
+ } else {
+ logLine(false, "The following extensions have newer versions:");
+ for (String withUpdate : withUpdates) {
+ logLine(false, withUpdate);
+ }
+ logLine(false, "");
+ }
+ }
+
+ /**
+ * @param pom the pom to update.
+ * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+ * @since 1.0-alpha-1
+ */
+ @Override
+ protected void update(ModifiedPomXMLEventReader pom) {
+ // do nothing
+ }
+}
diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayExtensionUpdatesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayExtensionUpdatesMojoTest.java
new file mode 100644
index 0000000000..2b8aec9134
--- /dev/null
+++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayExtensionUpdatesMojoTest.java
@@ -0,0 +1,184 @@
+package org.codehaus.mojo.versions;
+
+/*
+ * Copyright MojoHaus and Contributors
+ *
+ * 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
+ *
+ * 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.
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.ExtensionBuilder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.MockedStatic;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singleton;
+import static java.util.Collections.singletonList;
+import static org.apache.maven.plugin.testing.ArtifactStubFactory.setVariableValueToObject;
+import static org.codehaus.mojo.versions.utils.MockUtils.mockAetherRepositorySystem;
+import static org.codehaus.mojo.versions.utils.MockUtils.mockMavenSession;
+import static org.codehaus.mojo.versions.utils.MockUtils.mockRepositorySystem;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mockStatic;
+
+/**
+ * Basic tests for {@linkplain DisplayExtensionUpdatesMojo}.
+ *
+ * @author Andrzej Jarmoniuk
+ */
+public class DisplayExtensionUpdatesMojoTest {
+ private DisplayExtensionUpdatesMojo mojo;
+ private Path tempPath;
+
+ @Before
+ public void setUp() throws IllegalAccessException, IOException {
+ mojo = new DisplayExtensionUpdatesMojo(mockRepositorySystem(), mockAetherRepositorySystem(), null, null);
+ mojo.project = new MavenProject() {
+ {
+ setModel(new Model() {
+ {
+ setGroupId("default-group");
+ setArtifactId("default-artifact");
+ setVersion("1.0.0");
+ }
+ });
+ }
+ };
+ mojo.project.setRemoteArtifactRepositories(emptyList());
+ mojo.project.setPluginArtifactRepositories(emptyList());
+ mojo.session = mockMavenSession(mojo.project);
+ tempPath = Files.createTempFile("display-extension-updates-", ".log");
+ mojo.outputFile = tempPath.toFile();
+ mojo.outputEncoding = "UTF-8";
+ setVariableValueToObject(mojo, "processCoreExtensions", false);
+ // turning interpolateExtensions off so that we don't need to bother with the model tree
+ mojo.interpolateProperties = false;
+
+ mojo.setPluginContext(new HashMap() {
+ {
+ put(
+ "org.codehaus.mojo.versions.AbstractVersionsDisplayMojo.outputFile",
+ singleton(tempPath.toFile().getCanonicalPath()));
+ }
+ });
+ }
+
+ @After
+ public void tearDown() throws IOException {
+ Files.deleteIfExists(tempPath);
+ }
+
+ @Test
+ public void testNoBuildExists()
+ throws MojoExecutionException, MojoFailureException, IllegalAccessException, IOException {
+ setVariableValueToObject(mojo, "extensionIncludes", singletonList("*"));
+ setVariableValueToObject(mojo, "extensionExcludes", emptyList());
+ try (MockedStatic pomHelper = mockStatic(PomHelper.class)) {
+ pomHelper
+ .when(() -> PomHelper.getChildModels(ArgumentMatchers.any(MavenProject.class), any()))
+ .then(i -> Collections.singletonMap(null, ((MavenProject) i.getArgument(0)).getModel()));
+ mojo.execute();
+ }
+ }
+
+ @Test
+ public void testIncludesMakesSetEmpty()
+ throws MojoExecutionException, MojoFailureException, IllegalAccessException, IOException {
+ setVariableValueToObject(mojo, "extensionIncludes", singletonList("other-group"));
+ setVariableValueToObject(mojo, "extensionExcludes", emptyList());
+
+ mojo.getProject().setBuild(new Build());
+ mojo.getProject()
+ .getBuild()
+ .setExtensions(Collections.singletonList(ExtensionBuilder.newBuilder()
+ .withGroupId("default-group")
+ .withArtifactId("artifactA")
+ .withVersion("1.0.0")
+ .build()));
+ try (MockedStatic pomHelper = mockStatic(PomHelper.class)) {
+ pomHelper
+ .when(() -> PomHelper.getChildModels(ArgumentMatchers.any(MavenProject.class), any()))
+ .then(i -> Collections.singletonMap(null, ((MavenProject) i.getArgument(0)).getModel()));
+ mojo.execute();
+ }
+
+ assertThat(Files.readAllLines(tempPath), empty());
+ }
+
+ @Test
+ public void testIncludesMakesSetNonEmpty()
+ throws MojoExecutionException, MojoFailureException, IllegalAccessException, IOException {
+ setVariableValueToObject(mojo, "extensionIncludes", singletonList("default-group"));
+ setVariableValueToObject(mojo, "extensionExcludes", emptyList());
+
+ mojo.getProject().setBuild(new Build());
+ mojo.getProject()
+ .getBuild()
+ .setExtensions(Collections.singletonList(ExtensionBuilder.newBuilder()
+ .withGroupId("default-group")
+ .withArtifactId("artifactA")
+ .withVersion("1.0.0")
+ .build()));
+ try (MockedStatic pomHelper = mockStatic(PomHelper.class)) {
+ pomHelper
+ .when(() -> PomHelper.getChildModels(ArgumentMatchers.any(MavenProject.class), any()))
+ .then(i -> Collections.singletonMap(null, ((MavenProject) i.getArgument(0)).getModel()));
+ mojo.execute();
+ }
+
+ assertThat(
+ String.join("", Files.readAllLines(tempPath)),
+ containsString("default-group:artifactA ... 1.0.0 -> 2.0.0"));
+ }
+
+ @Test
+ public void testIncludesExcludesMakesSetEmpty()
+ throws MojoExecutionException, MojoFailureException, IllegalAccessException, IOException {
+ setVariableValueToObject(mojo, "extensionIncludes", singletonList("default-group"));
+ setVariableValueToObject(mojo, "extensionExcludes", singletonList("default-group:artifactA"));
+
+ mojo.getProject().setBuild(new Build());
+ mojo.getProject()
+ .getBuild()
+ .setExtensions(Collections.singletonList(ExtensionBuilder.newBuilder()
+ .withGroupId("default-group")
+ .withArtifactId("artifactA")
+ .withVersion("1.0.0")
+ .build()));
+ try (MockedStatic pomHelper = mockStatic(PomHelper.class)) {
+ pomHelper
+ .when(() -> PomHelper.getChildModels(ArgumentMatchers.any(MavenProject.class), any()))
+ .then(i -> Collections.singletonMap(null, ((MavenProject) i.getArgument(0)).getModel()));
+ mojo.execute();
+ }
+
+ assertThat(Files.readAllLines(tempPath), empty());
+ }
+}
diff --git a/versions-model-core-extensions/pom.xml b/versions-model-core-extensions/pom.xml
new file mode 100644
index 0000000000..3acd01a6f4
--- /dev/null
+++ b/versions-model-core-extensions/pom.xml
@@ -0,0 +1,63 @@
+
+
+ 4.0.0
+
+ org.codehaus.mojo.versions
+ versions
+ 2.15.0-SNAPSHOT
+
+
+ versions-model-core-extensions
+ Versions Model Core Extensions
+ Model classes and parser for Core Extensions
+
+
+
+ org.codehaus.plexus
+ plexus-utils
+
+
+
+
+
+
+ org.codehaus.modello
+ modello-maven-plugin
+
+
+ src/main/mdo/core-extensions.mdo
+
+ 1.1.0
+
+
+
+ generate-java-classes
+
+ xpp3-reader
+ java
+
+ generate-sources
+
+
+ generate-site-doc
+
+ xdoc
+
+ pre-site
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ true
+
+
+
+
+
+
+
+
diff --git a/versions-model-core-extensions/src/main/mdo/core-extensions.mdo b/versions-model-core-extensions/src/main/mdo/core-extensions.mdo
new file mode 100644
index 0000000000..32ee24e244
--- /dev/null
+++ b/versions-model-core-extensions/src/main/mdo/core-extensions.mdo
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+ core-extensions
+ CoreExtensions
+ This is a reference for the Core Extensions descriptor.
+ The default location for the Core Extensions descriptor file is ${maven.projectBasedir}/.mvn/extensions.xml
+ ]]>
+
+
+
+ package
+ org.apache.maven.cli.internal.extension.model
+
+
+
+
+
+ CoreExtensions
+ Extensions to load.
+ 1.0.0+
+
+
+ extensions
+ A set of build extensions to use from this project.
+ 1.0.0+
+
+ CoreExtension
+ *
+
+
+
+
+
+ CoreExtension
+ Describes a build extension to utilise.
+ 1.0.0+
+
+
+ groupId
+ The group ID of the extension's artifact.
+ 1.0.0+
+ true
+ String
+
+
+ artifactId
+ The artifact ID of the extension.
+ 1.0.0+
+ true
+ String
+
+
+ version
+ The version of the extension.
+ 1.0.0+
+ true
+ String
+
+
+ classLoadingStrategy
+ The class loading strategy: 'self-first' (the default), 'parent-first' (loads classes from the parent, then from the extension) or 'plugin' (follows the rules from extensions defined as plugins).
+ 1.1.0+
+ self-first
+ false
+ String
+
+
+
+
+ 1.0.0+
+
+ ::}, never {@code null}.
+ */
+ public String getId()
+ {
+ StringBuilder id = new StringBuilder( 128 );
+
+ id.append( ( getGroupId() == null ) ? "[unknown-group-id]" : getGroupId() );
+ id.append( ":" );
+ id.append( ( getArtifactId() == null ) ? "[unknown-artifact-id]" : getArtifactId() );
+ id.append( ":" );
+ id.append( ( getVersion() == null ) ? "[unknown-version]" : getVersion() );
+
+ return id.toString();
+ }
+ ]]>
+
+
+
+
+
+
diff --git a/versions-test/src/main/java/org/codehaus/mojo/versions/utils/MockUtils.java b/versions-test/src/main/java/org/codehaus/mojo/versions/utils/MockUtils.java
index 92a1d0cab7..e08b9322ab 100644
--- a/versions-test/src/main/java/org/codehaus/mojo/versions/utils/MockUtils.java
+++ b/versions-test/src/main/java/org/codehaus/mojo/versions/utils/MockUtils.java
@@ -1,24 +1,20 @@
+package org.codehaus.mojo.versions.utils;
+
/*
- * 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
+ * Copyright MojoHaus and Contributors
+ * 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.codehaus.mojo.versions.utils;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -152,11 +148,22 @@ public static RepositorySystem mockRepositorySystem() {
* @return mocked {@link MavenSession}
*/
public static MavenSession mockMavenSession() {
+ MavenProject project = mock(MavenProject.class);
+ when(project.getRemotePluginRepositories()).thenReturn(emptyList());
+ when(project.getRemoteProjectRepositories()).thenReturn(emptyList());
+ return mockMavenSession(project);
+ }
+
+ /**
+ * Creates a very simple mock of {@link MavenSession}
+ * by providing only a non-{@code null} implementation of its {@link MavenSession#getRepositorySession()} method.
+ * @param project {@link MavenProject} to link to
+ * @return mocked {@link MavenSession}
+ */
+ public static MavenSession mockMavenSession(MavenProject project) {
MavenSession session = mock(MavenSession.class);
when(session.getRepositorySession()).thenReturn(mock(RepositorySystemSession.class));
- when(session.getCurrentProject()).thenReturn(mock(MavenProject.class));
- when(session.getCurrentProject().getRemotePluginRepositories()).thenReturn(emptyList());
- when(session.getCurrentProject().getRemoteProjectRepositories()).thenReturn(emptyList());
+ when(session.getCurrentProject()).thenReturn(project);
return session;
}
}