sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1584413 - in /sis/branches/0.4: core/pom.xml core/sis-build-helper/pom.xml core/sis-metadata/pom.xml core/sis-referencing/pom.xml core/sis-utility/pom.xml pom.xml
Date Thu, 03 Apr 2014 21:46:29 GMT
Author: desruisseaux
Date: Thu Apr  3 21:46:28 2014
New Revision: 1584413

URL: http://svn.apache.org/r1584413
Log:
Merge the fix for Maven 3.2.

Modified:
    sis/branches/0.4/core/pom.xml
    sis/branches/0.4/core/sis-build-helper/pom.xml
    sis/branches/0.4/core/sis-metadata/pom.xml
    sis/branches/0.4/core/sis-referencing/pom.xml
    sis/branches/0.4/core/sis-utility/pom.xml
    sis/branches/0.4/pom.xml

Modified: sis/branches/0.4/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.4/core/pom.xml?rev=1584413&r1=1584412&r2=1584413&view=diff
==============================================================================
--- sis/branches/0.4/core/pom.xml (original)
+++ sis/branches/0.4/core/pom.xml Thu Apr  3 21:46:28 2014
@@ -125,6 +125,29 @@
 
 
   <!-- ===========================================================
+           Build configuration
+       =========================================================== -->
+  <build>
+    <plugins>
+
+      <!-- Collect JAR files in <root>/target/binaries directory. -->
+      <plugin>
+        <groupId>org.apache.sis.core</groupId>
+        <artifactId>sis-build-helper</artifactId>
+        <version>${sis.plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>collect-jars</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <!-- ===========================================================
            Sub-modules included in the build in dependency order
        =========================================================== -->
   <modules>

Modified: sis/branches/0.4/core/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.4/core/sis-build-helper/pom.xml?rev=1584413&r1=1584412&r2=1584413&view=diff
==============================================================================
--- sis/branches/0.4/core/sis-build-helper/pom.xml (original)
+++ sis/branches/0.4/core/sis-build-helper/pom.xml Thu Apr  3 21:46:28 2014
@@ -25,10 +25,12 @@
                                http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <!-- Do not inherit from core/pom.xml because doing so would create a cyclic dependency.
-->
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>core</artifactId>
+    <artifactId>parent</artifactId>
     <version>0.4-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
 

Modified: sis/branches/0.4/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.4/core/sis-metadata/pom.xml?rev=1584413&r1=1584412&r2=1584413&view=diff
==============================================================================
--- sis/branches/0.4/core/sis-metadata/pom.xml (original)
+++ sis/branches/0.4/core/sis-metadata/pom.xml Thu Apr  3 21:46:28 2014
@@ -109,20 +109,6 @@ Implementations of metadata derived from
   <build>
     <plugins>
 
-      <!-- Collect JAR files in <root>/target/binaries directory. -->
-      <plugin>
-        <groupId>org.apache.sis.core</groupId>
-        <artifactId>sis-build-helper</artifactId>
-        <version>${sis.plugin.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>collect-jars</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Package as OSGi bundle -->
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: sis/branches/0.4/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.4/core/sis-referencing/pom.xml?rev=1584413&r1=1584412&r2=1584413&view=diff
==============================================================================
--- sis/branches/0.4/core/sis-referencing/pom.xml (original)
+++ sis/branches/0.4/core/sis-referencing/pom.xml Thu Apr  3 21:46:28 2014
@@ -79,20 +79,6 @@ Implementations of Coordinate Reference 
   <build>
     <plugins>
 
-      <!-- Collect JAR files in <root>/target/binaries directory. -->
-      <plugin>
-        <groupId>org.apache.sis.core</groupId>
-        <artifactId>sis-build-helper</artifactId>
-        <version>${sis.plugin.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>collect-jars</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Package as OSGi bundle -->
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: sis/branches/0.4/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.4/core/sis-utility/pom.xml?rev=1584413&r1=1584412&r2=1584413&view=diff
==============================================================================
--- sis/branches/0.4/core/sis-utility/pom.xml (original)
+++ sis/branches/0.4/core/sis-utility/pom.xml Thu Apr  3 21:46:28 2014
@@ -133,7 +133,7 @@ Miscellaneous utilities.
         </executions>
       </plugin>
 
-      <!-- Compile properties files into resources UTF files and collect JAR files. -->
+      <!-- Compile properties files into resources UTF files. -->
       <plugin>
         <groupId>org.apache.sis.core</groupId>
         <artifactId>sis-build-helper</artifactId>
@@ -142,7 +142,6 @@ Miscellaneous utilities.
           <execution>
             <goals>
               <goal>compile-resources</goal>
-              <goal>collect-jars</goal>
             </goals>
           </execution>
         </executions>

Modified: sis/branches/0.4/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.4/pom.xml?rev=1584413&r1=1584412&r2=1584413&view=diff
==============================================================================
--- sis/branches/0.4/pom.xml (original)
+++ sis/branches/0.4/pom.xml Thu Apr  3 21:46:28 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>13</version> <!-- See the "TODO" in this file. -->
+    <version>14</version> <!-- See the "TODO" in this file. -->
   </parent>
 
 
@@ -431,7 +431,6 @@ Apache SIS is a free software, Java lang
       <!-- Compile -->
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version> <!-- TODO: Remove after parent pom.xml has
upgraded. -->
         <configuration>
           <source>${maven.compile.source}</source>
           <target>${maven.compile.target}</target>
@@ -488,7 +487,6 @@ Apache SIS is a free software, Java lang
       <!-- Set "*-source-release.zip" filename prefix to "sis-*" instead of "parent-*"
-->
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.4</version> <!-- TODO: Remove after parent pom.xml has
upgraded. -->
         <executions>
           <execution>
             <id>source-release-assembly</id>
@@ -517,7 +515,6 @@ Apache SIS is a free software, Java lang
            we disable links relativization for avoiding confusing behavior. -->
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.3</version> <!-- TODO: Remove after parent pom.xml has
upgraded. -->
         <configuration>
           <locales>${website.locale}</locales>
           <inputEncoding>${project.build.sourceEncoding}</inputEncoding>



Mime
View raw message