sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1519695 - in /sis/branches/JDK7: ./ core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/ core/sis-build-helper/src/main/java/org/apache/sis/util/resources/
Date Tue, 03 Sep 2013 14:22:53 GMT
Author: desruisseaux
Date: Tue Sep  3 14:22:52 2013
New Revision: 1519695

URL: http://svn.apache.org/r1519695
Log:
Follow the advice of warnings produced at Maven build, by replacing "@parameter expression="
in Mojo by "@parameter property=".
Also exclude the META-INF/maven entries from the JAR files.

Modified:
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
    sis/branches/JDK7/pom.xml

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java?rev=1519695&r1=1519694&r2=1519695&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
[UTF-8] Tue Sep  3 14:22:52 2013
@@ -56,7 +56,7 @@ public class Assembler extends AbstractM
     /**
      * Project information (name, version, URL).
      *
-     * @parameter default-value="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java?rev=1519695&r1=1519694&r2=1519695&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
[UTF-8] Tue Sep  3 14:22:52 2013
@@ -50,7 +50,7 @@ public class BundleCreator extends Abstr
     /**
      * Project information (name, version, URL).
      *
-     * @parameter default-value="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java?rev=1519695&r1=1519694&r2=1519695&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
[UTF-8] Tue Sep  3 14:22:52 2013
@@ -56,6 +56,7 @@ public final class JarCollector extends 
      *
      * @parameter property="project"
      * @required
+     * @readonly
      */
     private MavenProject project;
 

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java?rev=1519695&r1=1519694&r2=1519695&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
[UTF-8] Tue Sep  3 14:22:52 2013
@@ -46,7 +46,7 @@ public class ResourceCompilerMojo extend
     /**
      * Project information (name, version, URL).
      *
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */

Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1519695&r1=1519694&r2=1519695&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Tue Sep  3 14:22:52 2013
@@ -443,6 +443,7 @@ Apache SIS is a free software, Java lang
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <addMavenDescriptor>false</addMavenDescriptor>
             <index>false</index>
             <manifest>
               <addClasspath>true</addClasspath>



Mime
View raw message