Author: andham
Date: Wed Oct 23 12:45:23 2013
New Revision: 1535005
URL: http://svn.apache.org/r1535005
Log:
Upgraded m-invoker-p and aligned ITs on things like groupId, etc.
Modified:
maven/plugins/trunk/maven-source-plugin/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy
maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/jar/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/project-without-sources/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/pom.xml
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/verify.bsh
maven/plugins/trunk/maven-source-plugin/src/it/test-jar/pom.xml
Modified: maven/plugins/trunk/maven-source-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-source-plugin/pom.xml Wed Oct 23 12:45:23 2013
@@ -183,7 +183,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
Modified: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml Wed Oct
23 12:45:23 2013
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -21,10 +21,11 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>msources</groupId>
- <artifactId>62</artifactId>
+
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>MSOURCES-62</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+
<build>
<pluginManagement>
<plugins>
Modified: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/verify.bsh
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/verify.bsh Wed
Oct 23 12:45:23 2013
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
@@ -34,7 +33,7 @@ try
return false;
}
- File artifact = new File( target, "62-1.0-SNAPSHOT-sources.jar" );
+ File artifact = new File( target, "MSOURCES-62-1.0-SNAPSHOT-sources.jar" );
if ( !artifact.exists() || artifact.isDirectory() )
{
System.err.println( "artifact file is missing or a directory." );
@@ -58,9 +57,6 @@ try
System.err.println( "An-Entry manifest entry" + " not equals Some
Value" );
return false;
}
-
-
-
}
catch( Throwable e )
{
Modified: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml Wed Oct
23 12:45:23 2013
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -21,10 +21,11 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>msources</groupId>
- <artifactId>64</artifactId>
+
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>MSOURCES-64</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+
<build>
<pluginManagement>
<plugins>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy
Wed Oct 23 12:45:23 2013
@@ -1,22 +1,22 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-assert new File(basedir,"target/64-1.0-SNAPSHOT-test-sources.jar").exists()
-
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+assert new
File(basedir,"target/MSOURCES-64-1.0-SNAPSHOT-test-sources.jar").exists()
+
Modified: maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/pom.xml
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/pom.xml Wed Oct
23 12:45:23 2013
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
+ <groupId>org.apache.maven.its.ejb</groupId>
<artifactId>jar-attached</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
<executions>
<execution>
<id>attach-sources</id>
Modified: maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh Wed
Oct 23 12:45:23 2013
@@ -40,7 +40,7 @@ try
return false;
}
- File attachedFile = new File( localRepoDir,
"test/jar-attached/1.0-SNAPSHOT/jar-attached-1.0-SNAPSHOT-sources.jar" );
+ File attachedFile = new File( localRepoDir,
"org/apache/maven/its/ejb/jar-attached/1.0-SNAPSHOT/jar-attached-1.0-SNAPSHOT-sources.jar"
);
System.out.println( "Checking for existence of " + attachedFile );
if ( !attachedFile.isFile() )
{
Modified: maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/pom.xml
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/pom.xml Wed
Oct 23 12:45:23 2013
@@ -23,11 +23,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>jar</artifactId>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>jar-classifier</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Test for jar</name>
+ <name>Test for jar with classifier</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
<configuration>
<classifier>foo</classifier>
</configuration>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/verify.bsh
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/verify.bsh
Wed Oct 23 12:45:23 2013
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- File jarFile = new File( basedir, "target/jar-1.0-SNAPSHOT-foo.jar" );
+ File jarFile = new File( basedir,
"target/jar-classifier-1.0-SNAPSHOT-foo.jar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/pom.xml
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/pom.xml
Wed Oct 23 12:45:23 2013
@@ -23,11 +23,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>jar</artifactId>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>jar-includes-excludes</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Test for jar</name>
+ <name>Test of jar with includes/excludes</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
<executions>
<execution>
<id>jar</id>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/verify.bsh
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/verify.bsh
Wed Oct 23 12:45:23 2013
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- File jarFile = new File( basedir, "target/jar-1.0-SNAPSHOT-sources.jar" );
+ File jarFile = new File( basedir,
"target/jar-includes-excludes-1.0-SNAPSHOT-sources.jar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
@@ -65,7 +65,7 @@ try
}
- File jarFile = new File( basedir,
"target/jar-1.0-SNAPSHOT-test-sources.jar" );
+ File jarFile = new File( basedir,
"target/jar-includes-excludes-1.0-SNAPSHOT-test-sources.jar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
Modified: maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/pom.xml
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/pom.xml Wed Oct
23 12:45:23 2013
@@ -23,8 +23,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>jar</artifactId>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>jar-no-fork</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test for jar-no-fork</name>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
<executions>
<execution>
<id>attach-sources</id>
Modified: maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/verify.bsh
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/verify.bsh Wed
Oct 23 12:45:23 2013
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- File jarFile = new File( basedir, "target/jar-1.0-SNAPSHOT-sources.jar" );
+ File jarFile = new File( basedir,
"target/jar-no-fork-1.0-SNAPSHOT-sources.jar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/pom.xml
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/pom.xml
Wed Oct 23 12:45:23 2013
@@ -23,11 +23,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>jar</artifactId>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>jar-with-archive-config</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Test for jar</name>
+ <name>Test of archive manifest configuration</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
<configuration>
<archive>
<manifest>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/verify.bsh
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/verify.bsh
Wed Oct 23 12:45:23 2013
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- File jarFile = new File( basedir, "target/jar-1.0-SNAPSHOT-sources.jar" );
+ File jarFile = new File( basedir,
"target/jar-with-archive-config-1.0-SNAPSHOT-sources.jar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
Modified: maven/plugins/trunk/maven-source-plugin/src/it/jar/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/jar/pom.xml (original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/jar/pom.xml Wed Oct 23
12:45:23 2013
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
+ <groupId>org.apache.maven.its.ejb</groupId>
<artifactId>jar</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/verify.bsh
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/verify.bsh
Wed Oct 23 12:45:23 2013
@@ -21,7 +21,6 @@
import java.io.*;
import java.util.*;
import java.util.jar.*;
-import org.codehaus.plexus.util.*;
boolean result = true;
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/project-without-sources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/project-without-sources/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/it/project-without-sources/pom.xml
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/it/project-without-sources/pom.xml
Wed Oct 23 12:45:23 2013
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
+ <groupId>org.apache.maven.its.ejb</groupId>
<artifactId>project-without-sources</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -34,7 +34,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/pom.xml
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/pom.xml
Wed Oct 23 12:45:23 2013
@@ -23,11 +23,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>test-jar</artifactId>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>test-jar-classifier</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Test for test-jar</name>
+ <name>Test for test-jar with classifier</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
<configuration>
<classifier>bar</classifier>
</configuration>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/verify.bsh
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/verify.bsh
Wed Oct 23 12:45:23 2013
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- File jarFile = new File( basedir, "target/test-jar-1.0-SNAPSHOT-bar.jar" );
+ File jarFile = new File( basedir,
"target/test-jar-classifier-1.0-SNAPSHOT-bar.jar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/pom.xml
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/pom.xml
Wed Oct 23 12:45:23 2013
@@ -23,11 +23,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>test-jar</artifactId>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>test-jar-generated</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Test for test-jar</name>
+ <name>Test for generated-test-jar</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/verify.bsh
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/verify.bsh
Wed Oct 23 12:45:23 2013
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- File jarFile = new File( basedir,
"target/test-jar-1.0-SNAPSHOT-test-sources.jar" );
+ File jarFile = new File( basedir,
"target/test-jar-generated-1.0-SNAPSHOT-test-sources.jar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/pom.xml
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/pom.xml Wed
Oct 23 12:45:23 2013
@@ -23,8 +23,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>test-jar</artifactId>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>test-jar-no-fork</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test for test-jar-no-fork</name>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
<executions>
<execution>
<id>attach-test-sources</id>
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/verify.bsh?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/verify.bsh
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/verify.bsh
Wed Oct 23 12:45:23 2013
@@ -24,7 +24,7 @@ import java.util.regex.*;
try
{
- File jarFile = new File( basedir,
"target/test-jar-1.0-SNAPSHOT-test-sources.jar" );
+ File jarFile = new File( basedir,
"target/test-jar-no-fork-1.0-SNAPSHOT-test-sources.jar" );
System.out.println( "Checking for existence of " + jarFile );
if ( !jarFile.isFile() )
{
Modified: maven/plugins/trunk/maven-source-plugin/src/it/test-jar/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/test-jar/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/it/test-jar/pom.xml (original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/test-jar/pom.xml Wed Oct 23
12:45:23 2013
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
+ <groupId>org.apache.maven.its.ejb</groupId>
<artifactId>test-jar</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>@project.version@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
