From b3b7866073432d7c85a8a23872f2194dee3ac134 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sun, 4 Feb 2024 10:58:08 +0100 Subject: [PATCH] [MASSEMBLY-1017] Don't use deprecated methods in code (#182) --- pom.xml | 2 + .../archiver/AssemblyProxyArchiver.java | 13 ++ .../assembly/format/ReaderFormatter.java | 7 +- .../assembly/io/DefaultAssemblyReader.java | 9 +- .../assembly/utils/AssemblyFormatUtils.java | 8 +- .../archiver/AssemblyProxyArchiverTest.java | 1 + .../task/AddDependencySetsTaskTest.java | 18 ++- .../ComponentsXmlArchiverFileFilterTest.java | 111 ++++++++++-------- .../assembly/format/ReaderFormatterTest.java | 3 + .../utils/AssemblyFormatUtilsTest.java | 42 +++---- 10 files changed, 126 insertions(+), 88 deletions(-) diff --git a/pom.xml b/pom.xml index 142d6ce4..0b3aab8b 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,8 @@ under the License. + true + 8 2.2.0 3.2.5 diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java index 4a9658c4..e54cb58e 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java @@ -129,6 +129,7 @@ public AssemblyProxyArchiver( * {@inheritDoc} */ @Override + @Deprecated public void addArchivedFileSet( final File archiveFile, final String prefix, final String[] includes, final String[] excludes) { inPublicApi.set(Boolean.TRUE); @@ -158,6 +159,7 @@ private void debug(final String message) { * {@inheritDoc} */ @Override + @Deprecated public void addArchivedFileSet(final File archiveFile, final String prefix) { inPublicApi.set(Boolean.TRUE); try { @@ -178,6 +180,7 @@ public void addArchivedFileSet(final File archiveFile, final String prefix) { * {@inheritDoc} */ @Override + @Deprecated public void addArchivedFileSet(final File archiveFile, final String[] includes, final String[] excludes) { inPublicApi.set(Boolean.TRUE); try { @@ -200,6 +203,7 @@ public void addArchivedFileSet(final File archiveFile, final String[] includes, * {@inheritDoc} */ @Override + @Deprecated public void addArchivedFileSet(final File archiveFile) { inPublicApi.set(Boolean.TRUE); try { @@ -220,6 +224,7 @@ public void addArchivedFileSet(final File archiveFile) { * {@inheritDoc} */ @Override + @Deprecated public void addDirectory( final File directory, final String prefix, final String[] includes, final String[] excludes) { inPublicApi.set(Boolean.TRUE); @@ -270,6 +275,7 @@ public void addSymlink(String symlinkName, int permissions, String symlinkDestin * {@inheritDoc} */ @Override + @Deprecated public void addDirectory(final File directory, final String prefix) { inPublicApi.set(Boolean.TRUE); try { @@ -291,6 +297,7 @@ public void addDirectory(final File directory, final String prefix) { * {@inheritDoc} */ @Override + @Deprecated public void addDirectory(final File directory, final String[] includes, final String[] excludes) { inPublicApi.set(Boolean.TRUE); try { @@ -314,6 +321,7 @@ public void addDirectory(final File directory, final String[] includes, final St * {@inheritDoc} */ @Override + @Deprecated public void addDirectory(final File directory) { inPublicApi.set(Boolean.TRUE); try { @@ -777,6 +785,7 @@ public int getOverrideFileMode() { * {@inheritDoc} */ @Override + @Deprecated public boolean isUseJvmChmod() { return useJvmChmod; } @@ -785,6 +794,7 @@ public boolean isUseJvmChmod() { * {@inheritDoc} */ @Override + @Deprecated public void setUseJvmChmod(final boolean useJvmChmod) { this.useJvmChmod = useJvmChmod; } @@ -840,11 +850,13 @@ public boolean isSymbolicLink() { } @Override + @Deprecated public void setLastModifiedDate(Date lastModifiedDate) { delegate.setLastModifiedDate(lastModifiedDate); } @Override + @Deprecated public Date getLastModifiedDate() { return delegate.getLastModifiedDate(); } @@ -855,6 +867,7 @@ public void setFilenameComparator(Comparator filenameComparator) { } @Override + @Deprecated public void configureReproducible(Date outputTimestamp) { delegate.configureReproducible(outputTimestamp); } diff --git a/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java b/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java index f4e0e407..f612ac77 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java +++ b/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java @@ -140,9 +140,10 @@ public InputStream transform(PlexusIoResource plexusIoResource, InputStream inpu configSource, isPropertyFile, configSource.getAdditionalProperties()); - result = encoding != null - ? new ReaderInputStream(filtered, encoding) - : new ReaderInputStream(filtered); + result = ReaderInputStream.builder() + .setReader(filtered) + .setCharset(encoding) + .get(); } if (transformLineEndings) { checkifFileTypeIsAppropriateForLineEndingTransformation(plexusIoResource); diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java index be4af0d1..f81e8438 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java +++ b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java @@ -180,7 +180,8 @@ private Assembly addAssemblyForDescriptorReference( } } - try (Reader reader = new XmlStreamReader(resourceAsStream)) { + try (Reader reader = + XmlStreamReader.builder().setInputStream(resourceAsStream).get()) { final Assembly assembly = readAssembly(reader, ref, null, configSource); assemblies.add(assembly); return assembly; @@ -201,7 +202,7 @@ private Assembly addAssemblyFromDescriptorFile( } } - try (Reader r = new XmlStreamReader(descriptor)) { + try (Reader r = XmlStreamReader.builder().setFile(descriptor).get()) { final Assembly assembly = readAssembly(r, descriptor.getAbsolutePath(), descriptor.getParentFile(), configSource); @@ -233,7 +234,9 @@ private Assembly addAssemblyFromDescriptor( } } - try (Reader r = new XmlStreamReader(location.getInputStream())) { + try (Reader r = XmlStreamReader.builder() + .setInputStream(location.getInputStream()) + .get()) { File dir = null; if (location.getFile() != null) { dir = location.getFile().getParentFile(); diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java index b039e5eb..2d9b72a7 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java @@ -197,11 +197,9 @@ private static FixedStringSearchInterpolator executionPropertiesInterpolator( session = configSource.getMavenSession(); if (session != null) { - Properties userProperties = session.getExecutionProperties(); // this is added twice.... - - if (userProperties != null) { - return FixedStringSearchInterpolator.create(new PropertiesBasedValueSource(userProperties)); - } + return FixedStringSearchInterpolator.create( + new PropertiesBasedValueSource(session.getUserProperties()), + new PropertiesBasedValueSource(session.getSystemProperties())); } } return FixedStringSearchInterpolator.empty(); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java index c44afcbc..6545a5f9 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java @@ -130,6 +130,7 @@ public void addFile_NoPerms_CallAcceptFilesOnlyOnce() throws IOException, Archiv } @Test + @SuppressWarnings("deprecation") public void addDirectory_NoPerms_CallAcceptFilesOnlyOnce() throws IOException, ArchiverException { final Archiver delegate = new JarArchiver(); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java index 8908ea61..b364c714 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java @@ -124,7 +124,8 @@ public void testAddDependencySet_ShouldInterpolateDefaultOutputFileNameMapping() final MavenSession session = mock(MavenSession.class); when(session.getProjectBuildingRequest()).thenReturn(mock(ProjectBuildingRequest.class)); - when(session.getExecutionProperties()).thenReturn(new Properties()); + when(session.getUserProperties()).thenReturn(new Properties()); + when(session.getSystemProperties()).thenReturn(new Properties()); final AssemblerConfigurationSource configSource = mock(AssemblerConfigurationSource.class); when(configSource.getFinalName()).thenReturn(mainAid + "-" + mainVer); @@ -158,7 +159,8 @@ public void testAddDependencySet_ShouldInterpolateDefaultOutputFileNameMapping() verify(archiver).setFileMode(146); verify(session).getProjectBuildingRequest(); - verify(session, times(2)).getExecutionProperties(); + verify(session, times(2)).getUserProperties(); + verify(session, times(2)).getSystemProperties(); verify(projectBuilder).build(any(Artifact.class), any(ProjectBuildingRequest.class)); } @@ -211,7 +213,8 @@ public void testAddDependencySet_ShouldNotAddDependenciesWhenProjectIsStubbed() final MavenSession session = mock(MavenSession.class); when(session.getProjectBuildingRequest()).thenReturn(mock(ProjectBuildingRequest.class)); - when(session.getExecutionProperties()).thenReturn(new Properties()); + when(session.getUserProperties()).thenReturn(new Properties()); + when(session.getSystemProperties()).thenReturn(new Properties()); final AssemblerConfigurationSource configSource = mock(AssemblerConfigurationSource.class); when(configSource.getFinalName()).thenReturn("final-name"); @@ -238,7 +241,8 @@ public void testAddDependencySet_ShouldNotAddDependenciesWhenProjectIsStubbed() verify(archiver).getOverrideFileMode(); verify(session).getProjectBuildingRequest(); - verify(session, times(2)).getExecutionProperties(); + verify(session, times(2)).getUserProperties(); + verify(session, times(2)).getSystemProperties(); verify(projectBuilder).build(any(Artifact.class), any(ProjectBuildingRequest.class)); } @@ -269,7 +273,8 @@ private void verifyOneDependencyAdded(final String outputLocation, final boolean final MavenSession session = mock(MavenSession.class); when(session.getProjectBuildingRequest()).thenReturn(mock(ProjectBuildingRequest.class)); - when(session.getExecutionProperties()).thenReturn(new Properties()); + when(session.getUserProperties()).thenReturn(new Properties()); + when(session.getSystemProperties()).thenReturn(new Properties()); final AssemblerConfigurationSource configSource = mock(AssemblerConfigurationSource.class); when(configSource.getMavenSession()).thenReturn(session); @@ -318,7 +323,8 @@ private void verifyOneDependencyAdded(final String outputLocation, final boolean verify(archiver).setDirectoryMode(146); verify(session).getProjectBuildingRequest(); - verify(session, atLeastOnce()).getExecutionProperties(); + verify(session, atLeastOnce()).getUserProperties(); + verify(session, atLeastOnce()).getSystemProperties(); verify(projectBuilder).build(any(Artifact.class), any(ProjectBuildingRequest.class)); diff --git a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java index 108e0568..0e1743e6 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java @@ -47,8 +47,11 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; import org.jdom2.Document; import org.jdom2.Text; +import org.jdom2.filter.Filters; import org.jdom2.input.SAXBuilder; -import org.jdom2.xpath.XPath; +import org.jdom2.input.sax.XMLReaders; +import org.jdom2.xpath.XPathExpression; +import org.jdom2.xpath.XPathFactory; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -147,17 +150,19 @@ public void testAddToArchive_ShouldWriteComponentWithoutHintToFile() throws Exce assertEquals(ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH, fca.getDestFileName()); - final SAXBuilder builder = new SAXBuilder(false); + final SAXBuilder builder = new SAXBuilder(XMLReaders.NONVALIDATING); final Document doc = builder.build(fca.getFile()); + XPathFactory xPathFactory = XPathFactory.instance(); - final XPath role = XPath.newInstance("//component[position()=1]/role/text()"); - final XPath hint = XPath.newInstance("//component[position()=1]/role-hint/text()"); - final XPath implementation = XPath.newInstance("//component[position()=1]/implementation/text()"); + XPathExpression role = xPathFactory.compile("//component[position()=1]/role/text()", Filters.text()); + XPathExpression hint = xPathFactory.compile("//component[position()=1]/role-hint/text()", Filters.text()); + XPathExpression implementation = + xPathFactory.compile("//component[position()=1]/implementation/text()", Filters.text()); - assertEquals("role", ((Text) role.selectSingleNode(doc)).getText()); - assertNull(hint.selectSingleNode(doc)); - assertEquals("impl", ((Text) implementation.selectSingleNode(doc)).getText()); + assertEquals("role", role.evaluateFirst(doc).getText()); + assertNull(hint.evaluateFirst(doc)); + assertEquals("impl", implementation.evaluateFirst(doc).getText()); } @Test @@ -173,17 +178,19 @@ public void testAddToArchive_ShouldWriteComponentWithHintToFile() throws Excepti assertEquals(ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH, fca.getDestFileName()); - final SAXBuilder builder = new SAXBuilder(false); + final SAXBuilder builder = new SAXBuilder(XMLReaders.NONVALIDATING); final Document doc = builder.build(fca.getFile()); + XPathFactory xPathFactory = XPathFactory.instance(); - final XPath role = XPath.newInstance("//component[position()=1]/role/text()"); - final XPath hint = XPath.newInstance("//component[position()=1]/role-hint/text()"); - final XPath implementation = XPath.newInstance("//component[position()=1]/implementation/text()"); + XPathExpression role = xPathFactory.compile("//component[position()=1]/role/text()", Filters.text()); + XPathExpression hint = xPathFactory.compile("//component[position()=1]/role-hint/text()", Filters.text()); + XPathExpression implementation = + xPathFactory.compile("//component[position()=1]/implementation/text()", Filters.text()); - assertEquals("role", ((Text) role.selectSingleNode(doc)).getText()); - assertEquals("hint", ((Text) hint.selectSingleNode(doc)).getText()); - assertEquals("impl", ((Text) implementation.selectSingleNode(doc)).getText()); + assertEquals("role", role.evaluateFirst(doc).getText()); + assertEquals("hint", hint.evaluateFirst(doc).getText()); + assertEquals("impl", implementation.evaluateFirst(doc).getText()); } @Test @@ -204,25 +211,29 @@ public void testAddToArchive_ShouldWriteTwoComponentToFile() throws Exception { assertEquals(ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH, fca.getDestFileName()); - final SAXBuilder builder = new SAXBuilder(false); + final SAXBuilder builder = new SAXBuilder(XMLReaders.NONVALIDATING); final Document doc = builder.build(fca.getFile()); - - final XPath role = XPath.newInstance("//component[position()=1]/role/text()"); - final XPath hint = XPath.newInstance("//component[position()=1]/role-hint/text()"); - final XPath implementation = XPath.newInstance("//component[position()=1]/implementation/text()"); - - assertEquals("role", ((Text) role.selectSingleNode(doc)).getText()); - assertEquals("hint", ((Text) hint.selectSingleNode(doc)).getText()); - assertEquals("impl", ((Text) implementation.selectSingleNode(doc)).getText()); - - final XPath role2 = XPath.newInstance("//component[position()=2]/role/text()"); - final XPath hint2 = XPath.newInstance("//component[position()=2]/role-hint/text()"); - final XPath implementation2 = XPath.newInstance("//component[position()=2]/implementation/text()"); - - assertEquals("role", ((Text) role2.selectSingleNode(doc)).getText()); - assertEquals("hint2", ((Text) hint2.selectSingleNode(doc)).getText()); - assertEquals("impl", ((Text) implementation2.selectSingleNode(doc)).getText()); + XPathFactory xPathFactory = XPathFactory.instance(); + + XPathExpression role = xPathFactory.compile("//component[position()=1]/role/text()", Filters.text()); + XPathExpression hint = xPathFactory.compile("//component[position()=1]/role-hint/text()", Filters.text()); + XPathExpression implementation = + xPathFactory.compile("//component[position()=1]/implementation/text()", Filters.text()); + + assertEquals("role", role.evaluateFirst(doc).getText()); + assertEquals("hint", hint.evaluateFirst(doc).getText()); + assertEquals("impl", implementation.evaluateFirst(doc).getText()); + + XPathExpression role2 = xPathFactory.compile("//component[position()=2]/role/text()", Filters.text()); + XPathExpression hint2 = + xPathFactory.compile("//component[position()=2]/role-hint/text()", Filters.text()); + XPathExpression implementation2 = + xPathFactory.compile("//component[position()=2]/implementation/text()", Filters.text()); + + assertEquals("role", role2.evaluateFirst(doc).getText()); + assertEquals("hint2", hint2.evaluateFirst(doc).getText()); + assertEquals("impl", implementation2.evaluateFirst(doc).getText()); } @Test @@ -257,25 +268,29 @@ public void testAddToArchive_ShouldWriteTwoComponentToArchivedFile() throws Exce Files.copy(zf.getInputStream(ze), descriptorFile.toPath()); } - final SAXBuilder builder = new SAXBuilder(false); + final SAXBuilder builder = new SAXBuilder(XMLReaders.NONVALIDATING); final Document doc = builder.build(descriptorFile); - final XPath role = XPath.newInstance("//component[position()=1]/role/text()"); - final XPath hint = XPath.newInstance("//component[position()=1]/role-hint/text()"); - final XPath implementation = XPath.newInstance("//component[position()=1]/implementation/text()"); - - assertEquals("role", ((Text) role.selectSingleNode(doc)).getText()); - assertEquals("hint", ((Text) hint.selectSingleNode(doc)).getText()); - assertEquals("impl", ((Text) implementation.selectSingleNode(doc)).getText()); - - final XPath role2 = XPath.newInstance("//component[position()=2]/role/text()"); - final XPath hint2 = XPath.newInstance("//component[position()=2]/role-hint/text()"); - final XPath implementation2 = XPath.newInstance("//component[position()=2]/implementation/text()"); - - assertEquals("role", ((Text) role2.selectSingleNode(doc)).getText()); - assertEquals("hint2", ((Text) hint2.selectSingleNode(doc)).getText()); - assertEquals("impl", ((Text) implementation2.selectSingleNode(doc)).getText()); + XPathFactory xPathFactory = XPathFactory.instance(); + XPathExpression role = xPathFactory.compile("//component[position()=1]/role/text()", Filters.text()); + XPathExpression hint = xPathFactory.compile("//component[position()=1]/role-hint/text()", Filters.text()); + XPathExpression implementation = + xPathFactory.compile("//component[position()=1]/implementation/text()", Filters.text()); + + assertEquals("role", role.evaluateFirst(doc).getText()); + assertEquals("hint", hint.evaluateFirst(doc).getText()); + assertEquals("impl", implementation.evaluateFirst(doc).getText()); + + XPathExpression role2 = xPathFactory.compile("//component[position()=2]/role/text()", Filters.text()); + XPathExpression hint2 = + xPathFactory.compile("//component[position()=2]/role-hint/text()", Filters.text()); + XPathExpression implementation2 = + xPathFactory.compile("//component[position()=2]/implementation/text()", Filters.text()); + + assertEquals("role", role2.evaluateFirst(doc).getText()); + assertEquals("hint2", hint2.evaluateFirst(doc).getText()); + assertEquals("impl", implementation2.evaluateFirst(doc).getText()); } private Xpp3Dom createComponentDom(final ComponentDef def) { diff --git a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java index b82bdd2e..4c58bcd7 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.io.Reader; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -45,6 +46,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -100,6 +102,7 @@ public void nonFilteredFileExtensions() throws Exception { @Test public void additionalProperties() throws Exception { final MavenReaderFilter mavenReaderFilter = mock(MavenReaderFilter.class); + when(mavenReaderFilter.filter(any())).thenReturn(mock(Reader.class)); final PojoConfigSource cfg = getPojoConfigSource(); cfg.setMavenReaderFilter(mavenReaderFilter); diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java index c126cb58..befc1bbb 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java @@ -46,23 +46,23 @@ @RunWith(MockitoJUnitRunner.class) public class AssemblyFormatUtilsTest { @Test - public void testFixRelativePathRefs_ShouldRemoveRelativeRefToCurrentDir() throws Exception { + public void testFixRelativePathRefs_ShouldRemoveRelativeRefToCurrentDir() { assertEquals("path/", AssemblyFormatUtils.fixRelativeRefs("./path/")); } @Test - public void testFixRelativePathRefs_ShouldRemoveEmbeddedSameDirRef() throws Exception { + public void testFixRelativePathRefs_ShouldRemoveEmbeddedSameDirRef() { assertEquals("some/path/", AssemblyFormatUtils.fixRelativeRefs("some/./path/")); assertEquals("some\\path\\", AssemblyFormatUtils.fixRelativeRefs("some\\.\\path\\")); } @Test - public void testFixRelativePathRefs_ShouldRemoveEmbeddedParentDirRef() throws Exception { + public void testFixRelativePathRefs_ShouldRemoveEmbeddedParentDirRef() { assertEquals("path/", AssemblyFormatUtils.fixRelativeRefs("some/../path/")); } @Test - public void testFixRelativePathRefs_ShouldTruncateRelativeRefToParentDir() throws Exception { + public void testFixRelativePathRefs_ShouldTruncateRelativeRefToParentDir() { assertEquals("path/", AssemblyFormatUtils.fixRelativeRefs("../path/")); } @@ -254,8 +254,7 @@ public void testGetOutputDir_ShouldResolveProjectPropertyAltExpr() throws Except @Test public void - testEvalFileNameMapping_ShouldResolveArtifactIdAndBaseVersionInOutDir_UseArtifactInfo_WithValidMainProject() - throws Exception { + testEvalFileNameMapping_ShouldResolveArtifactIdAndBaseVersionInOutDir_UseArtifactInfo_WithValidMainProject() { final MavenProject mainProject = createProject("group", "main", "1", null); final String artifactVersion = "2-20070807.112233-1"; @@ -290,38 +289,37 @@ public void testGetOutputDir_ShouldResolveProjectPropertyAltExpr() throws Except } @Test - public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseArtifactInfo() throws Exception { + public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseArtifactInfo() { verifyEvalFileNameMappingUsingArtifactProject( "${artifact.groupId}", null, "group", null, null, null, "group", null); } @Test - public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseArtifactInfo() throws Exception { + public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseArtifactInfo() { verifyEvalFileNameMappingUsingArtifactProject( "${artifact.artifactId}", null, null, "artifact", null, null, "artifact", null); } @Test - public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseArtifactInfo() throws Exception { + public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseArtifactInfo() { verifyEvalFileNameMappingUsingArtifactProject( "${artifact.version}", null, null, null, "version", null, "version", null); } @Test - public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseArtifactInfoAndModulePrefix() throws Exception { + public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseArtifactInfoAndModulePrefix() { verifyEvalFileNameMappingUsingModuleProject( "${module.groupId}", null, "group", null, null, null, "group", null); } @Test - public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseArtifactInfoAndModulePrefix() - throws Exception { + public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseArtifactInfoAndModulePrefix() { verifyEvalFileNameMappingUsingModuleProject( "${module.artifactId}", null, null, "artifact", null, null, "artifact", null); } @Test - public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseArtifactInfoAndModulePrefix() throws Exception { + public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseArtifactInfoAndModulePrefix() { verifyEvalFileNameMappingUsingModuleProject( "${module.version}", null, null, null, "version", null, "version", null); } @@ -470,8 +468,7 @@ private void verifyEvalFileNameMappingUsingMainProject( final String version, final String extension, final String checkValue, - final Properties projectProperties) - throws AssemblyFormattingException { + final Properties projectProperties) { final MavenProject mainProject = createProject(groupId, artifactId, version, projectProperties); final MavenProject artifactProject = createProject("unknown", "unknown", "unknown", null); @@ -489,8 +486,7 @@ private void verifyEvalFileNameMappingUsingArtifactProject( final String version, final String extension, final String checkValue, - final Properties projectProperties) - throws AssemblyFormattingException { + final Properties projectProperties) { final MavenProject artifactProject = createProject(groupId, artifactId, version, projectProperties); final MavenProject mainProject = createProject("unknown", "unknown", "unknown", null); @@ -508,8 +504,7 @@ private void verifyEvalFileNameMappingUsingModuleProject( final String version, final String extension, final String checkValue, - final Properties projectProperties) - throws AssemblyFormattingException { + final Properties projectProperties) { final MavenProject moduleProject = createProject(groupId, artifactId, version, projectProperties); final MavenProject mainProject = createProject("unknown", "unknown", "unknown", null); @@ -550,8 +545,7 @@ private void verifyEvalFileNameMapping( final MavenProject mainProject, final MavenProject moduleProject, final MavenProject artifactProject, - final String checkValue) - throws AssemblyFormattingException { + final String checkValue) { Artifact artifactMock = mock(Artifact.class); when(artifactMock.getGroupId()).thenReturn(artifactProject.getGroupId()); @@ -564,7 +558,8 @@ private void verifyEvalFileNameMapping( when(moduleArtifactMock.getGroupId()).thenReturn(moduleProject.getGroupId()); final MavenSession session = mock(MavenSession.class); - when(session.getExecutionProperties()).thenReturn(System.getProperties()); + when(session.getUserProperties()).thenReturn(new Properties()); + when(session.getSystemProperties()).thenReturn(System.getProperties()); final AssemblerConfigurationSource cs = mock(AssemblerConfigurationSource.class); when(cs.getMavenSession()).thenReturn(session); @@ -677,7 +672,8 @@ private void verifyOutputDir( throws AssemblyFormattingException { final MavenSession session = mock(MavenSession.class); - when(session.getExecutionProperties()).thenReturn(System.getProperties()); + when(session.getUserProperties()).thenReturn(new Properties()); + when(session.getSystemProperties()).thenReturn(System.getProperties()); final AssemblerConfigurationSource cs = mock(AssemblerConfigurationSource.class); when(cs.getMavenSession()).thenReturn(session);