Author: gertv
Date: Sun Jul 19 13:08:50 2009
New Revision: 795533
URL: http://svn.apache.org/viewvc?rev=795533&view=rev
Log:
SM-1874/SM-1875: Update archetypes build to work with Hudson/Nexus combo
Modified:
servicemix/archetypes/trunk/pom.xml
servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml
servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/AbstractArchetypeTest.java
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/
(props changed)
servicemix/archetypes/trunk/servicemix-exec-service-unit/ (props changed)
servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/
(props changed)
servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/
(props changed)
servicemix/archetypes/trunk/servicemix-quartz-service-unit/ (props
changed)
servicemix/archetypes/trunk/servicemix-script-service-unit/ (props
changed)
servicemix/archetypes/trunk/servicemix-scripting-service-unit/ (props
changed)
servicemix/archetypes/trunk/servicemix-smpp-consumer-service-unit/ (props
changed)
servicemix/archetypes/trunk/servicemix-smpp-provider-service-unit/ (props
changed)
servicemix/archetypes/trunk/servicemix-snmp-service-unit/ (props changed)
servicemix/archetypes/trunk/servicemix-validation-service-unit/ (props
changed)
Modified: servicemix/archetypes/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/pom.xml?rev=795533&r1=795532&r2=795533&view=diff
==============================================================================
--- servicemix/archetypes/trunk/pom.xml (original)
+++ servicemix/archetypes/trunk/pom.xml Sun Jul 19 13:08:50 2009
@@ -80,12 +80,12 @@
<module>servicemix-osgi-cxf-code-first-archetype</module>
<module>servicemix-osgi-cxf-wsdl-first-archetype</module>
<module>servicemix-project-root</module>
- <!-- <module>servicemix-archetypes-itests</module> -->
+ <module>servicemix-archetypes-itests</module>
</modules>
<properties>
<components-version>2009.01</components-version>
- <servicemix-version>3.3</servicemix-version>
+ <servicemix-version>3.3.1</servicemix-version>
<servicemix-specs-version>1.1.1</servicemix-specs-version>
<servicemix-utils-version>1.1.0</servicemix-utils-version>
<xbean-version>3.4.3</xbean-version>
@@ -93,9 +93,9 @@
<cxf-version>2.1.4</cxf-version>
<xfire-version>1.2.5</xfire-version>
<activemq-version>5.2.0</activemq-version>
- <jaxb.version>2.1</jaxb.version>
- <jaxws.version>2.1</jaxws.version>
- <geronimo.wsmetadata.version>1.1.2</geronimo.wsmetadata.version>
+ <jaxb.version>2.1</jaxb.version>
+ <jaxws.version>2.1</jaxws.version>
+ <geronimo.wsmetadata.version>1.1.2</geronimo.wsmetadata.version>
</properties>
<repositories>
@@ -130,7 +130,7 @@
<outputDirectory>${basedir}/target/classes</outputDirectory>
<filters>
<!-- Don't like these bits.. archetypes should not be tied to specific
versions if possible -->
- <components-version>${pom.version}</components-version>
+ <components-version>${components-version}</components-version>
<jbi-maven-plugin-version>3.2.1</jbi-maven-plugin-version>
<servicemix-version>${servicemix-version}</servicemix-version>
<xbean-version>${xbean-version}</xbean-version>
@@ -146,7 +146,7 @@
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <url>http://repository.apache.org/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@@ -156,17 +156,17 @@
</repository>
</repositories>
<pluginRepositories>
- <pluginRepository>
+ <pluginRepository>
<id>apache.snapshots</id>
<name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
+ <url>http://repository.apache.org/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
</pluginRepositories>
]]></repositories>
</filters>
Modified: servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml?rev=795533&r1=795532&r2=795533&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml Sun Jul 19
13:08:50 2009
@@ -302,6 +302,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>-Dmaven.repo.local=${settings.localRepository}</argLine>
<forkMode>always</forkMode>
<workingDirectory>${basedir}</workingDirectory>
<includes>
Modified:
servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/AbstractArchetypeTest.java
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/AbstractArchetypeTest.java?rev=795533&r1=795532&r2=795533&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/AbstractArchetypeTest.java
(original)
+++
servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/AbstractArchetypeTest.java
Sun Jul 19 13:08:50 2009
@@ -25,6 +25,8 @@
import java.util.UUID;
import junit.framework.TestCase;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.cli.ConsoleDownloadMonitor;
import org.apache.maven.embedder.MavenEmbedder;
@@ -38,6 +40,7 @@
public abstract class AbstractArchetypeTest extends TestCase {
+ private static final String MAVEN_REPO_LOCAL = "maven.repo.local";
private static final File baseDir = new File(System.getProperty("basedir",
".")).getAbsoluteFile();
private MavenEmbedder maven;
@@ -47,6 +50,10 @@
protected void setUp() throws Exception {
maven = new MavenEmbedder();
maven.setOffline(false);
+ if (StringUtils.isNotEmpty(sysProps.getProperty(MAVEN_REPO_LOCAL))) {
+ maven.setLocalRepositoryDirectory(new
File(sysProps.getProperty(MAVEN_REPO_LOCAL)));
+ }
+
ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
maven.setClassLoader(classLoader);
MavenEmbedderLogger logger = new MavenEmbedderConsoleLogger();
Propchange:
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -1 +1,3 @@
target
+.classpath
+.project
Propchange: servicemix/archetypes/trunk/servicemix-exec-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Propchange:
servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -1 +1,3 @@
target
+.classpath
+.project
Propchange:
servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -1 +1,3 @@
target
+.project
+.classpath
Propchange: servicemix/archetypes/trunk/servicemix-quartz-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -1 +1,3 @@
target
+.classpath
+.project
Propchange: servicemix/archetypes/trunk/servicemix-script-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Propchange: servicemix/archetypes/trunk/servicemix-scripting-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -1 +1,3 @@
target
+.classpath
+.project
Propchange: servicemix/archetypes/trunk/servicemix-smpp-consumer-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Propchange: servicemix/archetypes/trunk/servicemix-smpp-provider-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Propchange: servicemix/archetypes/trunk/servicemix-snmp-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -1 +1,3 @@
target
+.classpath
+.project
Propchange: servicemix/archetypes/trunk/servicemix-validation-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 19 13:08:50 2009
@@ -1 +1,3 @@
target
+.classpath
+.project
