You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by vi...@apache.org on 2006/10/19 23:58:22 UTC
svn commit: r465906 - in /incubator/qpid/branches/maven: broker/pom.xml
client/pom.xml cluster/pom.xml cluster/src/main/ cluster/src/main/java/
cluster/src/main/java/org/ cluster/src/org/ common/pom.xml
management/core/pom.xml pom.xml
Author: vinoski
Date: Thu Oct 19 14:58:19 2006
New Revision: 465906
URL: http://svn.apache.org/viewvc?view=rev&rev=465906
Log:
further directory moves for maven
Added:
incubator/qpid/branches/maven/cluster/src/main/
incubator/qpid/branches/maven/cluster/src/main/java/
incubator/qpid/branches/maven/cluster/src/main/java/org/
- copied from r465131, incubator/qpid/branches/maven/cluster/src/org/
Removed:
incubator/qpid/branches/maven/cluster/src/org/
Modified:
incubator/qpid/branches/maven/broker/pom.xml
incubator/qpid/branches/maven/client/pom.xml
incubator/qpid/branches/maven/cluster/pom.xml
incubator/qpid/branches/maven/common/pom.xml
incubator/qpid/branches/maven/management/core/pom.xml
incubator/qpid/branches/maven/pom.xml
Modified: incubator/qpid/branches/maven/broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/broker/pom.xml?view=diff&rev=465906&r1=465905&r2=465906
==============================================================================
--- incubator/qpid/branches/maven/broker/pom.xml (original)
+++ incubator/qpid/branches/maven/broker/pom.xml Thu Oct 19 14:58:19 2006
@@ -46,11 +46,11 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-java5</artifactId>
</dependency>
<dependency>
Modified: incubator/qpid/branches/maven/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/client/pom.xml?view=diff&rev=465906&r1=465905&r2=465906
==============================================================================
--- incubator/qpid/branches/maven/client/pom.xml (original)
+++ incubator/qpid/branches/maven/client/pom.xml Thu Oct 19 14:58:19 2006
@@ -55,7 +55,7 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
</dependency>
<dependency>
Modified: incubator/qpid/branches/maven/cluster/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/cluster/pom.xml?view=diff&rev=465906&r1=465905&r2=465906
==============================================================================
--- incubator/qpid/branches/maven/cluster/pom.xml (original)
+++ incubator/qpid/branches/maven/cluster/pom.xml Thu Oct 19 14:58:19 2006
@@ -37,15 +37,17 @@
</properties>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-broker</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/qpid/branches/maven/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/common/pom.xml?view=diff&rev=465906&r1=465905&r2=465906
==============================================================================
--- incubator/qpid/branches/maven/common/pom.xml (original)
+++ incubator/qpid/branches/maven/common/pom.xml Thu Oct 19 14:58:19 2006
@@ -50,19 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.version}</version>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>protocol-version</id>
@@ -92,7 +79,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</dependency>
</dependencies>
Modified: incubator/qpid/branches/maven/management/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/management/core/pom.xml?view=diff&rev=465906&r1=465905&r2=465906
==============================================================================
--- incubator/qpid/branches/maven/management/core/pom.xml (original)
+++ incubator/qpid/branches/maven/management/core/pom.xml Thu Oct 19 14:58:19 2006
@@ -135,39 +135,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.version}</version>
- <dependencies>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean_xpath</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xmlpublic</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>xmlbeans-gen</id>
Modified: incubator/qpid/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/pom.xml?view=diff&rev=465906&r1=465905&r2=465906
==============================================================================
--- incubator/qpid/branches/maven/pom.xml (original)
+++ incubator/qpid/branches/maven/pom.xml Thu Oct 19 14:58:19 2006
@@ -78,7 +78,6 @@
<java.source.version>1.5</java.source.version>
<compile.flags>-Xlint:fallthrough,finally</compile.flags>
-
<!--Versions for various plugins and features -->
<antrun.version>1.1</antrun.version>
<assembly.version>2.1</assembly.version>
@@ -159,6 +158,43 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${antrun.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean_xpath</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlpublic</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${jar.version}</version>
</plugin>
@@ -364,17 +400,17 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.mina</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-java5</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
@@ -485,39 +521,21 @@
<repositories>
<repository>
- <id>private-repo</id>
- <name>private repo</name>
- <url>file:${basedir}/${topDirectoryLocation}/maven_repo</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
<id>java.net</id>
<name>java.net Maven Repository</name>
<url>https://maven-repository.dev.java.net/nonav/repository/</url>
<layout>legacy</layout>
</repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache SNAPSHOT Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>snapshots_internal</id>
- <name>Internal Repository</name>
- <url>file:${basedir}/${topDirectoryLocation}/maven_repo</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<profiles>
<profile>
<id>fastinstall</id>
@@ -558,7 +576,6 @@
</plugins>
</build>
</profile>
-
<profile>
<id>setup.eclipse</id>