You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2012/11/16 09:21:19 UTC
svn commit: r1410244 - in /maven/indexer/trunk: indexer-cli/pom.xml
indexer-core/pom.xml pom.xml
Author: cstamas
Date: Fri Nov 16 08:21:18 2012
New Revision: 1410244
URL: http://svn.apache.org/viewvc?rev=1410244&view=rev
Log:
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).
Modified:
maven/indexer/trunk/indexer-cli/pom.xml
maven/indexer/trunk/indexer-core/pom.xml
maven/indexer/trunk/pom.xml
Modified: maven/indexer/trunk/indexer-cli/pom.xml
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-cli/pom.xml?rev=1410244&r1=1410243&r2=1410244&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-cli/pom.xml (original)
+++ maven/indexer/trunk/indexer-cli/pom.xml Fri Nov 16 08:21:18 2012
@@ -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>
Modified: maven/indexer/trunk/indexer-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/pom.xml?rev=1410244&r1=1410243&r2=1410244&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/pom.xml (original)
+++ maven/indexer/trunk/indexer-core/pom.xml Fri Nov 16 08:21:18 2012
@@ -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>
Modified: maven/indexer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/pom.xml?rev=1410244&r1=1410243&r2=1410244&view=diff
==============================================================================
--- maven/indexer/trunk/pom.xml (original)
+++ maven/indexer/trunk/pom.xml Fri Nov 16 08:21:18 2012
@@ -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>