You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/06/09 17:57:25 UTC
svn commit: r1491232 - in /sis/branches/JDK6: ./ CHANGES
core/sis-build-helper/pom.xml core/sis-utility/pom.xml
Author: desruisseaux
Date: Sun Jun 9 15:57:24 2013
New Revision: 1491232
URL: http://svn.apache.org/r1491232
Log:
Merge from trunk.
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/CHANGES
sis/branches/JDK6/core/sis-build-helper/pom.xml
sis/branches/JDK6/core/sis-utility/pom.xml
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
Merged /sis/trunk:r1490724-1491230
Modified: sis/branches/JDK6/CHANGES
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/CHANGES?rev=1491232&r1=1491231&r2=1491232&view=diff
==============================================================================
--- sis/branches/JDK6/CHANGES (original)
+++ sis/branches/JDK6/CHANGES Sun Jun 9 15:57:24 2013
@@ -3,6 +3,8 @@ Apache SIS Change Log
Release 0.3 - Current Development
+* SIS-103: Fix Eclipse errors in SIS (Travis Pinney via mattmann)
+
* SIS-101 Moved QuadTree, GeoRSSData and related classes to their own package,
namely "org.apache.sis.index.tree".
Modified: sis/branches/JDK6/core/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/pom.xml?rev=1491232&r1=1491231&r2=1491232&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK6/core/sis-build-helper/pom.xml Sun Jun 9 15:57:24 2013
@@ -25,22 +25,6 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!--
- This pom.xml uses the ${maven.version} property,
- which has been introduced only in Maven 3.0.4.
- (See http://jira.codehaus.org/browse/MNG-4112)
-
- We should declare 3.0.4 below, but at the time of writing
- Apache Jenkins is still using Maven 3.0.3. Users of Maven
- versions older than 3.0.4 need to specify their version
- on the command line, using the -D option like below:
-
- -Dmaven.version=3.0.3
- -->
- <prerequisites>
- <maven>3.0.3</maven>
- </prerequisites>
-
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
@@ -92,7 +76,12 @@ Define Maven Mojos and Javadoc taglets f
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>${maven.version}</version>
+ <version>3.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>3.0.5</version>
</dependency>
</dependencies>
Modified: sis/branches/JDK6/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/pom.xml?rev=1491232&r1=1491231&r2=1491232&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/pom.xml (original)
+++ sis/branches/JDK6/core/sis-utility/pom.xml Sun Jun 9 15:57:24 2013
@@ -115,6 +115,7 @@ Miscellaneous utilities.
<!-- Delete the "com/sun/xml/..." directory after compilation. -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>