Skip to content

Commit 0fb7fc3

Browse files
krosenvoldkrosenvold
committed
o Updated spice parent version
1 parent 6e1dbb2 commit 0fb7fc3

File tree

8 files changed

+56
-90
lines changed

8 files changed

+56
-90
lines changed

‎pom.xml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.sonatype.spice</groupId>
88
<artifactId>spice-parent</artifactId>
9-
<version>16</version>
9+
<version>17</version>
1010
</parent>
1111

1212
<groupId>org.codehaus.plexus</groupId>
@@ -25,6 +25,23 @@
2525
<url>http://jira.codehaus.org/browse/PLXCOMP/component/12540</url>
2626
</issueManagement>
2727

28+
<distributionManagement>
29+
<repository>
30+
<id>plexus-releases</id>
31+
<name>Plexus Release Repository</name>
32+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
33+
</repository>
34+
<snapshotRepository>
35+
<id>plexus-snapshots</id>
36+
<name>Plexus Snapshot Repository</name>
37+
<url>${plexusDistMgmtSnapshotsUrl}</url>
38+
</snapshotRepository>
39+
<site>
40+
<id>codehaus.org</id>
41+
<url>dav:https://dav.codehaus.org/plexus</url>
42+
</site>
43+
</distributionManagement>
44+
2845
<properties>
2946
<useJvmChmod>false</useJvmChmod>
3047
</properties>
@@ -61,23 +78,12 @@
6178
<plugin>
6279
<groupId>org.apache.maven.plugins</groupId>
6380
<artifactId>maven-surefire-plugin</artifactId>
64-
<version>2.6</version>
65-
6681
<configuration>
6782
<systemPropertyVariables>
6883
<useJvmChmod>${useJvmChmod}</useJvmChmod>
6984
</systemPropertyVariables>
7085
</configuration>
7186
</plugin>
72-
<plugin>
73-
<groupId>org.apache.maven.plugins</groupId>
74-
<artifactId>maven-compiler-plugin</artifactId>
75-
<version>2.3.1</version>
76-
<configuration>
77-
<source>1.5</source>
78-
<target>1.5</target>
79-
</configuration>
80-
</plugin>
8187
</plugins>
8288
</build>
8389

‎src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,19 @@
1717
* limitations under the License.
1818
*/
1919

20+
import java.io.File;
21+
import java.io.FileInputStream;
22+
import java.io.IOException;
23+
import java.io.InputStream;
24+
import java.lang.reflect.UndeclaredThrowableException;
25+
import java.util.ArrayList;
26+
import java.util.HashMap;
27+
import java.util.HashSet;
28+
import java.util.Iterator;
29+
import java.util.List;
30+
import java.util.Map;
31+
import java.util.NoSuchElementException;
32+
import java.util.Set;
2033
import org.codehaus.plexus.PlexusConstants;
2134
import org.codehaus.plexus.PlexusContainer;
2235
import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -40,20 +53,6 @@
4053
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
4154
import org.codehaus.plexus.util.IOUtil;
4255

43-
import java.io.File;
44-
import java.io.FileInputStream;
45-
import java.io.IOException;
46-
import java.io.InputStream;
47-
import java.lang.reflect.UndeclaredThrowableException;
48-
import java.util.ArrayList;
49-
import java.util.HashMap;
50-
import java.util.HashSet;
51-
import java.util.Iterator;
52-
import java.util.List;
53-
import java.util.Map;
54-
import java.util.NoSuchElementException;
55-
import java.util.Set;
56-
5756
/**
5857
* @version $Id$
5958
*/
@@ -410,10 +409,9 @@ public ResourceIterator getResources()
410409

411410
private ArchiveEntry nextEntry;
412411

413-
private final Set seenEntries = new HashSet();
412+
private final Set<String> seenEntries = new HashSet<String>();
414413

415414
public boolean hasNext()
416-
throws ArchiverException
417415
{
418416
if ( nextEntry == null )
419417
{
@@ -499,7 +497,6 @@ else if ( Archiver.DUPLICATES_FAIL.equals( duplicateBehavior ) )
499497
}
500498

501499
public ArchiveEntry next()
502-
throws ArchiverException
503500
{
504501
if ( !hasNext() )
505502
{
@@ -513,6 +510,11 @@ public ArchiveEntry next()
513510

514511
return next;
515512
}
513+
514+
public void remove()
515+
{
516+
throw new UnsupportedOperationException( "Does not support iterator" );
517+
}
516518
};
517519
}
518520

‎src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public static ArchiveEntry createFileEntry( String target, File file, int permis
162162
throw new ArchiverException( "Failed to read filesystem attributes for: " + file, e );
163163
}
164164

165-
final PlexusIoFileResource res = new PlexusIoFileResource( file, attrs );
165+
final PlexusIoFileResource res = PlexusIoFileResource.existingFile( file, attrs );
166166
return new ArchiveEntry( target, res, FILE, permissions );
167167
}
168168

‎src/main/java/org/codehaus/plexus/archiver/ArchiverException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
public class ArchiverException
20-
extends Exception
20+
extends RuntimeException
2121
{
2222
public ArchiverException( String message )
2323
{

‎src/main/java/org/codehaus/plexus/archiver/ResourceIterator.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.codehaus.plexus.archiver;
22

3-
public interface ResourceIterator
3+
import java.util.Iterator;
4+
5+
public interface ResourceIterator extends Iterator<ArchiveEntry>
46
{
5-
boolean hasNext()
6-
throws ArchiverException;
7+
boolean hasNext();
8+
9+
ArchiveEntry next();
710

8-
ArchiveEntry next()
9-
throws ArchiverException;
1011
}

‎src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.io.IOException;
55
import java.util.Enumeration;
66
import java.util.Iterator;
7-
87
import org.codehaus.plexus.components.io.resources.AbstractPlexusIoArchiveResourceCollection;
8+
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
99

1010

1111
public class PlexusIoTarFileResourceCollection
@@ -21,7 +21,7 @@ protected TarFile newTarFile( File file )
2121
return new TarFile( file );
2222
}
2323

24-
protected Iterator getEntries()
24+
protected Iterator<PlexusIoResource> getEntries()
2525
throws IOException
2626
{
2727
final File f = getFile();
@@ -31,19 +31,17 @@ protected Iterator getEntries()
3131
}
3232
final TarFile tarFile = newTarFile( f );
3333
final Enumeration en = tarFile.getEntries();
34-
return new Iterator()
34+
return new Iterator<PlexusIoResource>()
3535
{
3636
public boolean hasNext()
3737
{
3838
return en.hasMoreElements();
3939
}
4040

41-
public Object next()
41+
public PlexusIoResource next()
4242
{
4343
final TarEntry entry = (TarEntry) en.nextElement();
44-
final TarResource res = new TarResource( tarFile, entry );
45-
46-
return res;
44+
return new TarResource( tarFile, entry );
4745
}
4846

4947
public void remove()

‎src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -153,46 +153,6 @@ public boolean isInUpdateMode()
153153
return doUpdate;
154154
}
155155

156-
// /**
157-
// * A 3 digit octal string, specify the user, group and
158-
// * other modes in the standard Unix fashion;
159-
// * optional, default=0644
160-
// *
161-
// * @deprecated use AbstractArchiver.setDefaultFileMode(int) instead.
162-
// */
163-
// public void setFileMode( String octalString )
164-
// {
165-
// setDefaultFileMode( Integer.parseInt( octalString, 8 ) );
166-
// }
167-
//
168-
// /**
169-
// * @deprecated use AbstractArchiver.getDefaultFileMode() instead.
170-
// */
171-
// public int getFileMode()
172-
// {
173-
// return getDefaultFileMode();
174-
// }
175-
//
176-
// /**
177-
// * A 3 digit octal string, specify the user, group and
178-
// * other modes in the standard Unix fashion;
179-
// * optional, default=0755
180-
// *
181-
// * @deprecated use AbstractArchiver.setDefaultDirectoryMode(int).
182-
// */
183-
// public void setDirMode( String octalString )
184-
// {
185-
// setDefaultDirectoryMode( Integer.parseInt( octalString, 8 ) );
186-
// }
187-
//
188-
// /**
189-
// * @deprecated use AbstractArchiver.getDefaultDirectoryMode() instead.
190-
// */
191-
// public int getDirMode()
192-
// {
193-
// return getDefaultDirectoryMode();
194-
// }
195-
//
196156
/**
197157
* If true, emulate Sun's jar utility by not adding parent directories;
198158
* optional, defaults to false.

‎src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.codehaus.plexus.archiver.zip;
22

3-
import org.codehaus.plexus.components.io.resources.AbstractPlexusIoArchiveResourceCollection;
4-
53
import java.io.File;
64
import java.io.IOException;
75
import java.util.Enumeration;
86
import java.util.Iterator;
7+
import org.codehaus.plexus.components.io.resources.AbstractPlexusIoArchiveResourceCollection;
8+
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
99

1010
public class PlexusIoZipFileResourceCollection
1111
extends AbstractPlexusIoArchiveResourceCollection
@@ -16,7 +16,7 @@ public class PlexusIoZipFileResourceCollection
1616
*/
1717
public static final String ROLE_HINT = "zip";
1818

19-
protected Iterator getEntries()
19+
protected Iterator<PlexusIoResource> getEntries()
2020
throws IOException
2121
{
2222
final File f = getFile();
@@ -26,19 +26,18 @@ protected Iterator getEntries()
2626
}
2727
final ZipFile zipFile = new ZipFile( f );
2828
final Enumeration en = zipFile.getEntries();
29-
return new Iterator()
29+
return new Iterator<PlexusIoResource>()
3030
{
3131
public boolean hasNext()
3232
{
3333
return en.hasMoreElements();
3434
}
3535

36-
public Object next()
36+
public PlexusIoResource next()
3737
{
3838
final ZipEntry entry = (ZipEntry) en.nextElement();
39-
final ZipResource res = new ZipResource( zipFile, entry );
4039

41-
return res;
40+
return new ZipResource( zipFile, entry );
4241
}
4342

4443
public void remove()

0 commit comments

Comments
 (0)