Permalink
Browse files

MINDEXER-64: Update TrueZip to latest stable release

Used TrueZip was a "rc" release. This change updates
it to latest one. There is no API change, but
slightly more excludes are added to prevent
TrueZip Swing related artifact to come in.

Note: new dependency of TrueZip (bouncycastle) is
"shaved" for JAR signature, but only in the shaded
CLI Jar.

Note: TrueZip was always  and is Java6, while MI is Java5!
But as classpath discovery is used to decide is it used or not
this does not oppose problem. Simply, you should include
it if you want to use it, and you are on Java6. On
Java5 you should NOT include it (this is unchanged
and was true for MI 4.x releases too).

git-svn-id: https://svn.apache.org/repos/asf/maven/indexer/trunk@1410244 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 99b1eb0 commit c51ae227324842416e8a683469fd497fd4baa834 @cstamas cstamas committed Nov 16, 2012
Showing with 52 additions and 15 deletions.
  1. +11 −8 indexer-cli/pom.xml
  2. +1 −6 indexer-core/pom.xml
  3. +40 −1 pom.xml
View
@@ -37,6 +37,7 @@ under the License.
UNWORKABLE! -->
<dependencies>
+ <!-- The indexer -->
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-artifact</artifactId>
@@ -79,14 +80,10 @@ under the License.
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-file</artifactId>
- <version>${truezip.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-driver-zip</artifactId>
- <version>${truezip.version}</version>
- <scope>compile</scope>
</dependency>
<!-- Test -->
@@ -99,18 +96,15 @@ under the License.
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>
- <version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- <version>${wagon.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -120,7 +114,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3.3</version>
+ <version>1.7.1</version>
<executions>
<execution>
<id>jdk15</id>
@@ -138,6 +132,15 @@ under the License.
<mainClass>org.apache.maven.index.cli.NexusIndexerCli</mainClass>
</transformer>
</transformers>
+ <filters>
+ <filter>
+ <artifact>org.bouncycastle:*</artifact>
+ <excludes>
+ <exclude>META-INF/BCKEY.SF</exclude>
+ <exclude>META-INF/BCKEY.DSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
View
@@ -156,17 +156,15 @@ under the License.
</exclusions>
</dependency>
- <!-- ZipFacade -->
+ <!-- ZipFacade (as optional, who wants to use it should include TrueZip) -->
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-file</artifactId>
- <version>${truezip.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-driver-zip</artifactId>
- <version>${truezip.version}</version>
<optional>true</optional>
</dependency>
@@ -180,18 +178,15 @@ under the License.
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>
- <version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- <version>${wagon.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
View
41 pom.xml
@@ -78,7 +78,7 @@ under the License.
<aether.version>1.13.1</aether.version>
<archetype.version>2.2</archetype.version>
<wagon.version>2.2</wagon.version>
- <truezip.version>7.0-rc1</truezip.version>
+ <truezip.version>7.6.6</truezip.version>
</properties>
<distributionManagement>
@@ -102,18 +102,57 @@ under the License.
<version>3.0.5</version>
<scope>compile</scope>
</dependency>
+
+ <!-- ZipFacade -->
+ <dependency>
+ <groupId>de.schlichtherle.truezip</groupId>
+ <artifactId>truezip-file</artifactId>
+ <version>${truezip.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.schlichtherle.truezip</groupId>
+ <artifactId>truezip-driver-zip</artifactId>
+ <version>${truezip.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>de.schlichtherle.truezip</groupId>
+ <artifactId>truezip-swing</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
<version>${sisu-inject-plexus.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.19</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>${wagon.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>

0 comments on commit c51ae22

Please sign in to comment.