Author: ogusakov
Date: Mon Jan 19 10:57:34 2009
New Revision: 735771
URL: http://svn.apache.org/viewvc?rev=735771&view=rev
Log:
preparing the release
Modified:
maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
maven/mercury/trunk/mercury-util/pom.xml
maven/mercury/trunk/pom.xml
Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml?rev=735771&r1=735770&r2=735771&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Mon Jan 19
10:57:34 2009
@@ -47,5 +47,6 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=735771&r1=735770&r2=735771&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
(original)
+++
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
Mon Jan 19 10:57:34 2009
@@ -155,8 +155,10 @@
if ( loc.getVersion() == null )
{
- res.addError( bmd, new RepositoryException( LANG.getMessage(
"gav.not.found", bmd.toString(),
-
loc.getGaPath() ) ) );
+// res.addError( bmd, new RepositoryException( LANG.getMessage(
"gav.not.found", bmd.toString(),
+//
loc.getGaPath() ) ) );
+ if( LOG.isErrorEnabled() )
+ LOG.error( LANG.getMessage( "gav.not.found",
bmd.toString(), loc.getGaPath() ) );
return null;
}
@@ -178,8 +180,10 @@
File gavDir = new File( gaDir, loc.getVersion() );
if ( !gavDir.exists() )
{
- res.addError( bmd, new RepositoryException( LANG.getMessage(
"gavdir.not.found", bmd.toString(),
-
gavDir.getAbsolutePath() ) ) );
+// res.addError( bmd, new RepositoryException( LANG.getMessage(
"gavdir.not.found", bmd.toString(),
+//
gavDir.getAbsolutePath() ) ) );
+ if( LOG.isErrorEnabled() )
+ LOG.error( LANG.getMessage( "gavdir.not.found",
bmd.toString(), gavDir.getAbsolutePath() ) );
return null;
}
@@ -224,13 +228,15 @@
// binary calculated
if ( !binary.exists() )
{
- res.addError( bmd, new RepositoryException( LANG.getMessage(
"binary.not.found", bmd.toString(),
-
binary.getAbsolutePath() ) ) );
+// res.addError( bmd, new RepositoryException( LANG.getMessage(
"binary.not.found", bmd.toString(),
+//
binary.getAbsolutePath() ) ) );
+ if( LOG.isErrorEnabled() )
+ LOG.error( LANG.getMessage( "binary.not.found",
bmd.toString(), binary.getAbsolutePath() ) );
+
continue;
}
- try
- // reading pom if one exists
+ try // reading pom if one exists
{
if ( checkFile( binary, vFacs ) )
{
@@ -453,8 +459,11 @@
if ( loc.getVersion() == null )
{
- res.addError( bmd, new RepositoryException( LANG.getMessage(
"snapshot.not.found", bmd.toString(),
-
gavDir.getAbsolutePath() ) ) );
+// res.addError( bmd, new RepositoryException( LANG.getMessage(
"snapshot.not.found", bmd.toString(),
+//
gavDir.getAbsolutePath() ) ) );
+ if( LOG.isErrorEnabled() )
+ LOG.error( LANG.getMessage( "snapshot.not.found",
bmd.toString(), gavDir.getAbsolutePath() ) );
+
return false;
}
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=735771&r1=735770&r2=735771&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
(original)
+++
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Mon Jan 19 10:57:34 2009
@@ -197,7 +197,10 @@
if( ver == null )
{
- res.addError( bmd, new RepositoryException( LANG.getMessage(
"gav.not.found", bmd.toString(), loc.getGaPath() ) ) );
+// res.addError( bmd, new RepositoryException( LANG.getMessage(
"gav.not.found", bmd.toString(), loc.getGaPath() ) ) );
+ if( LOG.isErrorEnabled() )
+ LOG.error( LANG.getMessage( "gav.not.found", bmd.toString(),
loc.getGaPath() ) );
+
return null;
}
@@ -297,8 +300,11 @@
}
catch( Exception e )
{
- res.addError( bmd, new RepositoryException( LANG.getMessage(
"cached.metadata.reading.exception", e.getMessage(), bmd.toString(),
_repo.getServer().getURL().toString() ) ) );
- return false;
+// res.addError( bmd, new RepositoryException( LANG.getMessage(
"cached.metadata.reading.exception", e.getMessage(), bmd.toString(),
_repo.getServer().getURL().toString() ) ) );
+ if( LOG.isErrorEnabled() )
+ LOG.error( LANG.getMessage( "cached.metadata.reading.exception",
e.getMessage(), bmd.toString(), _repo.getServer().getURL().toString() ) );
+
+ return false;
}
// version-SNAPSHOT or exact TS exists?
@@ -312,7 +318,10 @@
if( ver == null )
{
- res.addError( bmd, new RepositoryException( LANG.getMessage(
"snapshot.not.found", _repo.getServer().getURL().toString(), bmd.toString() ) )
);
+// res.addError( bmd, new RepositoryException( LANG.getMessage(
"snapshot.not.found", _repo.getServer().getURL().toString(), bmd.toString() ) )
);
+ if( LOG.isErrorEnabled() )
+ LOG.error( LANG.getMessage( "snapshot.not.found",
_repo.getServer().getURL().toString(), bmd.toString() ) );
+
return false;
}
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml?rev=735771&r1=735770&r2=735771&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml Mon
Jan 19 10:57:34 2009
@@ -87,6 +87,33 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcpg-jdk15</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <scope>test</scope>
+ <optional>false</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcpg-jdk15</artifactId>
+ <scope>test</scope>
+ <optional>false</optional>
+ </dependency>
+
</dependencies>
<build>
Modified: maven/mercury/trunk/mercury-util/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/pom.xml?rev=735771&r1=735770&r2=735771&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/pom.xml (original)
+++ maven/mercury/trunk/mercury-util/pom.xml Mon Jan 19 10:57:34 2009
@@ -42,6 +42,18 @@
</dependency>
<dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcpg-jdk15</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
</dependency>
@@ -50,6 +62,21 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <scope>test</scope>
+ <optional>false</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcpg-jdk15</artifactId>
+ <scope>test</scope>
+ <optional>false</optional>
+ </dependency>
+
</dependencies>
<build>
Modified: maven/mercury/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=735771&r1=735770&r2=735771&view=diff
==============================================================================
--- maven/mercury/trunk/pom.xml (original)
+++ maven/mercury/trunk/pom.xml Mon Jan 19 10:57:34 2009
@@ -79,8 +79,14 @@
<commons.digester.version>1.8</commons.digester.version>
<commons.cli.version>1.1</commons.cli.version>
- <jetty.version>6.1-SNAPSHOT</jetty.version>
+ <jetty.version>6.1-20081027.122859-83</jetty.version>
+ <jetty.client.version>6.1-20090117.135319-41</jetty.client.version>
+
<jetty.servlet.api.version>6.1-20081027.122859-80</jetty.servlet.api.version>
+ <jetty.util5.version>6.1-20081228.163933-16</jetty.util5.version>
+
<jetty.servlet.tester.version>6.1-20081228.163933-73</jetty.servlet.tester.version>
+
<junit.version>3.8.1</junit.version>
+
<bouncy.castle.version>140</bouncy.castle.version>
<sat4j.version>2.0.4</sat4j.version>
@@ -192,7 +198,7 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-client</artifactId>
<classifier>assembly</classifier>
- <version>6.1-SNAPSHOT</version>
+ <version>${jetty.client.version}</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
@@ -218,19 +224,19 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.servlet.api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util5</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.util5.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-servlet-tester</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.servlet.tester.version}</version>
</dependency>
<dependency>
