You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/22 18:24:44 UTC
svn commit: r1073424 - in /karaf/branches/karaf-2.2.x:
archetypes/command/pom.xml archetypes/itests/pom.xml
archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
manual/pom.xml pom.xml
Author: gnodet
Date: Tue Feb 22 17:24:43 2011
New Revision: 1073424
URL: http://svn.apache.org/viewvc?rev=1073424&view=rev
Log:
Try to fix build on maven 2
Modified:
karaf/branches/karaf-2.2.x/archetypes/command/pom.xml
karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml
karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
karaf/branches/karaf-2.2.x/manual/pom.xml
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/archetypes/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/command/pom.xml?rev=1073424&r1=1073423&r2=1073424&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/command/pom.xml Tue Feb 22 17:24:43 2011
@@ -27,7 +27,7 @@
<groupId>org.apache.karaf.archetypes</groupId>
<artifactId>archetypes-command</artifactId>
-
+ <packaging>maven-archetype</packaging>
<name>Apache Karaf :: Command Archetype</name>
<build>
Modified: karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml?rev=1073424&r1=1073423&r2=1073424&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/itests/pom.xml Tue Feb 22 17:24:43 2011
@@ -31,6 +31,11 @@
<name>Apache Karaf :: Archetypes :: ITests</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.archetypes</groupId>
+ <artifactId>archetypes-command</artifactId>
+ </dependency>
+
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
Modified: karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java?rev=1073424&r1=1073423&r2=1073424&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java (original)
+++ karaf/branches/karaf-2.2.x/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java Tue Feb 22 17:24:43 2011
@@ -61,6 +61,7 @@ public abstract class AbstractArchetypeT
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
maven.setClassLoader(classLoader);
MavenEmbedderLogger logger = new MavenEmbedderConsoleLogger();
+// logger.setThreshold(MavenEmbedderConsoleLogger.LEVEL_DEBUG);
maven.setLogger(logger);
maven.start();
@@ -93,10 +94,16 @@ public abstract class AbstractArchetypeT
File targetDir = new File(baseDir, "target/archetypes/" + artifactId);
FileUtils.deleteDirectory(targetDir);
targetDir.mkdirs();
- EventMonitor eventMonitor = new DefaultEventMonitor(new PlexusLoggerAdapter(
- new MavenEmbedderConsoleLogger()));
+ MavenEmbedderConsoleLogger logger = new MavenEmbedderConsoleLogger();
+// logger.setThreshold(MavenEmbedderConsoleLogger.LEVEL_DEBUG);
+ EventMonitor eventMonitor = new DefaultEventMonitor(new PlexusLoggerAdapter(logger));
+
+ String catalog = "file://" + new File(maven.getLocalRepositoryDirectory().getParent(), "archetype-catalog.xml").getAbsolutePath();
+ System.err.println("Catalog: " + catalog);
Properties props = new Properties();
+ props.setProperty("archetypeCatalog", catalog);
+ props.setProperty("archetypeRepository", "file://" + maven.getLocalRepositoryDirectory().getAbsolutePath());
props.setProperty("archetypeGroupId", groupId);
props.setProperty("archetypeArtifactId", artifactId);
props.setProperty("archetypeVersion", version);
Modified: karaf/branches/karaf-2.2.x/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/manual/pom.xml?rev=1073424&r1=1073423&r2=1073424&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/manual/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/manual/pom.xml Tue Feb 22 17:24:43 2011
@@ -272,9 +272,9 @@
<executions>
<execution>
<id>generate-htmls</id>
- <phase>compile</phase>
+ <phase>prepare-package</phase>
<goals>
- <goal>sitegen</goal>
+ <goal>sitegen-no-fork</goal>
</goals>
<configuration>
<warSourceDirectory>${project.build.directory}/webapp</warSourceDirectory>
@@ -283,8 +283,7 @@
</executions>
<configuration>
<remoteServerId>people.apache.org</remoteServerId>
- <remoteServerUrl>scp://people.apache.org/www/karaf.apache.org/manual/${karaf.version}
- </remoteServerUrl>
+ <remoteServerUrl>scp://people.apache.org/www/karaf.apache.org/manual/${karaf.version}</remoteServerUrl>
</configuration>
<dependencies>
<dependency>
@@ -305,7 +304,7 @@
<executions>
<execution>
<id>create-manual</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>run</goal>
</goals>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1073424&r1=1073423&r2=1073424&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Tue Feb 22 17:24:43 2011
@@ -488,6 +488,11 @@
<artifactId>org.apache.karaf.tooling.testing</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf.archetypes</groupId>
+ <artifactId>archetypes-command</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
@@ -1307,6 +1312,29 @@
</modules>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[2.2.1,3)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>1.6</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- We want to deploy the artifact to a staging location for perusal -->
<plugin>
<inherited>true</inherited>