Skip to content

Commit 6c9d93a

Browse files
committed
Removed PlexusIoZipFileResourceCollection, see README.md for notes
1 parent de3b52d commit 6c9d93a

File tree

5 files changed

+8
-243
lines changed

5 files changed

+8
-243
lines changed

README.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ It is therefore recommended to run mvn -Djava.language.downgrade=true clean inst
88
that features still work with older jdk versions.
99

1010

11-
Upgrade notes
12-
==============
11+
Version 2.6
12+
===========
13+
PlexusIoZipFileResourceCollection removed from plexus io and added to plexus-archiver 2.10. Older versions
14+
of plexus-archiver may not be compatible with this.
15+
16+
17+
Version 2.1
18+
===========
1319

1420
In 2.1, all subclasses of AbstractPlexusIoResource now have to call appropriate parent
1521
constructor, there are no more setters.

src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoZipFileResourceCollection.java

-132
This file was deleted.

src/main/resources/META-INF/plexus/components.xml

-12
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,5 @@
8484
<implementation>org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection</implementation>
8585
<instantiation-strategy>per-lookup</instantiation-strategy>
8686
</component>
87-
<component>
88-
<role>org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection</role>
89-
<role-hint>zipFile</role-hint>
90-
<implementation>org.codehaus.plexus.components.io.resources.PlexusIoZipFileResourceCollection</implementation>
91-
<instantiation-strategy>per-lookup</instantiation-strategy>
92-
</component>
93-
<component>
94-
<role>org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection</role>
95-
<role-hint>jarFile</role-hint>
96-
<implementation>org.codehaus.plexus.components.io.resources.PlexusIoZipFileResourceCollection</implementation>
97-
<instantiation-strategy>per-lookup</instantiation-strategy>
98-
</component>
9987
</components>
10088
</component-set>

src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java

-10
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection;
3333
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
3434
import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
35-
import org.codehaus.plexus.components.io.resources.PlexusIoZipFileResourceCollection;
3635
import org.codehaus.plexus.util.FileUtils;
3736

3837

@@ -236,13 +235,4 @@ private void testZipFileCollection( AbstractPlexusIoArchiveResourceCollection re
236235
resourceCollection.setFile( zipFile );
237236
testPlexusIoResourceCollection( resourceCollection );
238237
}
239-
240-
public void testZipFileCollection() throws Exception
241-
{
242-
createFiles();
243-
final File zipFile = new File( getTestDir(), "files.zip" );
244-
createZipFile( zipFile, getFilesDir() );
245-
testZipFileCollection( (AbstractPlexusIoArchiveResourceCollection) lookup( PlexusIoResourceCollection.ROLE, PlexusIoZipFileResourceCollection.ROLE_HINT ), zipFile );
246-
testZipFileCollection( (AbstractPlexusIoArchiveResourceCollection) lookup( PlexusIoResourceCollection.ROLE, PlexusIoZipFileResourceCollection.JAR_ROLE_HINT ), zipFile );
247-
}
248238
}

src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoZipFileResourceCollectionTest.java

-87
This file was deleted.

0 commit comments

Comments
 (0)