Author: desruisseaux
Date: Fri Feb 21 16:42:56 2014
New Revision: 1570630
URL: http://svn.apache.org/r1570630
Log:
New attempt to declare the UCAR repository only in the NetCDF module,
since a few experiments with Maven 3.1.1 suggests that the exception
previously seen with Maven 3.0.4 has been fixed.
Modified:
sis/branches/JDK7/core/sis-build-helper/pom.xml
sis/branches/JDK7/pom.xml
sis/branches/JDK7/storage/sis-netcdf/pom.xml
Modified: sis/branches/JDK7/core/sis-build-helper/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/pom.xml?rev=1570630&r1=1570629&r2=1570630&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK7/core/sis-build-helper/pom.xml Fri Feb 21 16:42:56 2014
@@ -86,12 +86,12 @@ Define Maven Mojos and Javadoc taglets f
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.0.5</version>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.5</version>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
Modified: sis/branches/JDK7/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1570630&r1=1570629&r2=1570630&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Fri Feb 21 16:42:56 2014
@@ -800,23 +800,14 @@ Apache SIS is a free software, Java lang
</pluginRepository>
</pluginRepositories>
+ <!-- Used for GeoAPI snapshots and latest vecmath releases
+ on SIS branches only. Shall be removed on SIS trunk. -->
<repositories>
<repository>
- <!-- Used for GeoAPI snapshots and latest vecmath releases
- on SIS branches only. Shall be removed on SIS trunk. -->
<id>geotoolkit</id>
<name>Geotoolkit.org repository</name>
<url>http://maven.geotoolkit.org</url>
</repository>
- <!-- UCAR repository from which to download the NetCDF library. -->
- <repository>
- <id>UCAR</id>
- <name>UCAR repository</name>
-
<url>https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
Modified: sis/branches/JDK7/storage/sis-netcdf/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/pom.xml?rev=1570630&r1=1570629&r2=1570630&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK7/storage/sis-netcdf/pom.xml Fri Feb 21 16:42:56 2014
@@ -139,4 +139,16 @@ Bridge between NetCDF Climate and Foreca
</dependency>
</dependencies>
+ <!-- UCAR repository from which to download the NetCDF library. -->
+ <repositories>
+ <repository>
+ <id>UCAR</id>
+ <name>UCAR repository</name>
+
<url>https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
</project>