Hi Hervé,
unfortunately i had already the impression that this is causing the
problem....
I will dive deeper into it ....
Kind regards
Karl-Heinz Marbaise
On 4/5/14 6:35 PM, Hervé BOUTEMY wrote:
Hi Karl Heinz,
This commit seems to have broken descriptor-refs/src/src-dir-copied/pom.xml IT
see
https://builds.apache.org/view/M-R/view/Maven/job/maven-plugins-ITs-m3.0.4/514/
can you have a look at it, please?
Thank you
Hervé
Le samedi 22 mars 2014 22:57:47 [email protected] a écrit :
Author: khmarbaise
Date: Sat Mar 22 22:57:46 2014
New Revision: 1580355
URL: http://svn.apache.org/r1580355
Log:
[MASSEMBLY-693]
- Using filtering to automatically
generate correct versions for XSD references
in pre-defined descriptors.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin
.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar
-with-dependencies.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/pro
ject.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src
.xml
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.
vm
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.
xml?rev=1580355&r1=1580354&r2=1580355&view=diff
===========================================================================
=== --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat Mar 22 22:57:46
2014 @@ -235,6 +235,7 @@ under the License.
<resources>
<resource>
<directory>src/main/resources</directory>
+ <filtering>true</filtering>
</resource>
<resource>
<directory>${project.build.directory}/generated-resources/plexus</directory
@@ -303,6 +304,14 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <escapeString>\</escapeString>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${mavenPluginVersion}</version>
<configuration>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin
.xml URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/
main/resources/assemblies/bin.xml?rev=1580355&r1=1580354&r2=1580355&view=dif
f
===========================================================================
=== ---
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin
.xml (original) +++
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin
.xml Sat Mar 22 22:57:46 2014 @@ -19,9 +19,9 @@
-->
<!-- START SNIPPET: bin -->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
" +<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdo
Version}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/a
ssembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> +
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/a
ssembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";> <id>bin</id>
<formats>
<format>tar.gz</format>
@@ -30,7 +30,7 @@
</formats>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
+ <directory>\${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README*</include>
@@ -39,14 +39,14 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.build.directory}</directory>
+ <directory>\${project.build.directory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/site</directory>
+ <directory>\${project.build.directory}/site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
</fileSets>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar
-with-dependencies.xml URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/
main/resources/assemblies/jar-with-dependencies.xml?rev=1580355&r1=1580354&r
2=1580355&view=diff
===========================================================================
=== ---
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar
-with-dependencies.xml (original) +++
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar
-with-dependencies.xml Sat Mar 22 22:57:46 2014 @@ -19,9 +19,9 @@
-->
<!-- START SNIPPET: jar-with-dependencies -->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
" +<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdo
Version}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/a
ssembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> +
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/a
ssembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";> <!-- TODO: a
jarjar format would be better -->
<id>jar-with-dependencies</id>
<formats>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/pro
ject.xml URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/
main/resources/assemblies/project.xml?rev=1580355&r1=1580354&r2=1580355&view
=diff
===========================================================================
=== ---
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/pro
ject.xml (original) +++
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/pro
ject.xml Sat Mar 22 22:57:46 2014 @@ -19,9 +19,9 @@
-->
<!-- START SNIPPET: project -->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
" +<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdo
Version}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/a
ssembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> +
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/a
ssembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";> <id>project</id>
<formats>
<format>tar.gz</format>
@@ -30,12 +30,12 @@
</formats>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
+ <directory>\${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.log</exclude>
- <exclude>**/${project.build.directory}/**</exclude>
+ <exclude>**/\${project.build.directory}/**</exclude>
</excludes>
</fileSet>
</fileSets>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src
.xml URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/
main/resources/assemblies/src.xml?rev=1580355&r1=1580354&r2=1580355&view=dif
f
===========================================================================
=== ---
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src
.xml (original) +++
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src
.xml Sat Mar 22 22:57:46 2014 @@ -18,9 +18,9 @@
under the License.
-->
<!-- START SNIPPET: src -->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
" +<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdo
Version}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/a
ssembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> +
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/a
ssembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";> <id>src</id>
<formats>
<format>tar.gz</format>
@@ -29,7 +29,7 @@
</formats>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
+ <directory>\${project.basedir}</directory>
<includes>
<include>README*</include>
<include>LICENSE*</include>
@@ -39,8 +39,7 @@
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
<fileSet>
- <!-- TODO: use expresssions instead:
${project.build.sourceDirectory}, etc --> -
<directory>${project.basedir}/src</directory>
+ <directory>\${project.build.sourceDirectory}</directory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.
vm URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/
site/apt/descriptor-refs.apt.vm?rev=1580355&r1=1580354&r2=1580355&view=diff
===========================================================================
=== ---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.
vm (original) +++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.
vm Sat Mar 22 22:57:46 2014 @@ -49,7 +49,7 @@ Pre-defined Descriptor Files
Below is the <<<bin>>> descriptor format:
-%{snippet|id=bin|file=src/main/resources/assemblies/bin.xml}
+%{snippet|id=bin|file=target/classes/assemblies/bin.xml}
* jar-with-dependencies
@@ -65,7 +65,7 @@ Pre-defined Descriptor Files
Below is the <<<jar-with-dependencies>>> descriptor format:
-%{snippet|id=jar-with-dependencies|file=src/main/resources/assemblies/jar-w
ith-dependencies.xml}
+%{snippet|id=jar-with-dependencies|file=target/classes/assemblies/jar-with
-dependencies.xml}
* src
@@ -77,7 +77,7 @@ Pre-defined Descriptor Files
Below is the <<<src>>> descriptor format:
-%{snippet|id=src|file=src/main/resources/assemblies/src.xml}
+%{snippet|id=src|file=target/classes/assemblies/src.xml}
* project
@@ -93,4 +93,4 @@ Pre-defined Descriptor Files
The following is the assembly descriptor for the <<<project>>>
descriptorRef:
-%{snippet|id=project|file=src/main/resources/assemblies/project.xml}
+%{snippet|id=project|file=target/classes/assemblies/project.xml}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
Mit freundlichem Gruß
Karl-Heinz Marbaise
--
SoftwareEntwicklung Beratung Schulung Tel.: +49 (0) 2405 / 415 893
Dipl.Ing.(FH) Karl-Heinz Marbaise ICQ#: 135949029
Hauptstrasse 177 USt.IdNr: DE191347579
52146 Würselen http://www.soebes.de
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
