Author: lcorneliussen
Date: Wed Feb 9 14:37:28 2011
New Revision: 1068908
URL: http://svn.apache.org/viewvc?rev=1068908&view=rev
Log:
#1 Now building against 1.3-incubating as stable.version
#2 Some enhancements for building on MVN 3 (bound the npanday-group-repo)
Modified:
incubator/npanday/trunk/dotnet/pom.xml
incubator/npanday/trunk/pom.xml
Modified: incubator/npanday/trunk/dotnet/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/pom.xml?rev=1068908&r1=1068907&r2=1068908&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/pom.xml Wed Feb 9 14:37:28 2011
@@ -48,10 +48,10 @@ under the License.
</plugins>
<pluginManagement>
<plugins>
- <!-- Must peg to a previous release to avoid MNG-1911 bug -->
<plugin>
<groupId>npanday.plugin</groupId>
<artifactId>maven-compile-plugin</artifactId>
+ <extensions>true</extensions>
<version>${stable.npanday.version}</version>
</plugin>
<plugin>
@@ -72,13 +72,30 @@ under the License.
<plugin>
<groupId>npanday.plugin</groupId>
<artifactId>maven-resolver-plugin</artifactId>
+ <version>${stable.npanday.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>npanday.plugin</groupId>
+ <artifactId>maven-xsd-plugin</artifactId>
+ <version>${stable.npanday.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>npanday.plugin</groupId>
+ <artifactId>maven-test-plugin</artifactId>
+ <version>${stable.npanday.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>npanday.plugin</groupId>
+ <artifactId>maven-mojo-generator-plugin</artifactId>
+ <version>${stable.npanday.version}</version>
+ </plugin>
<plugin>
<groupId>npanday.plugin</groupId>
<artifactId>NPanday.Plugin.Settings.JavaBinding</artifactId>
+ <version>${stable.npanday.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Modified: incubator/npanday/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1068908&r1=1068907&r2=1068908&view=diff
==============================================================================
--- incubator/npanday/trunk/pom.xml (original)
+++ incubator/npanday/trunk/pom.xml Wed Feb 9 14:37:28 2011
@@ -578,8 +578,7 @@ under the License.
<mavenVersion>2.0.9</mavenVersion>
<npanday.snapshots.url>http://repo.npanday.org/archiva/repository/npanday-snapshots</npanday.snapshots.url>
<npanday.releases.url>http://repo.npanday.org/archiva/repository/npanday-releases</npanday.releases.url>
- <stable.npanday.version>1.2.1</stable.npanday.version>
-
<!--<stable.npanday.version>1.2.2-incubating-SNAPSHOT</stable.npanday.version>-->
+ <stable.npanday.version>1.3-incubating</stable.npanday.version>
</properties>
<distributionManagement>
<repository>
@@ -587,12 +586,11 @@ under the License.
<url>http://vmbuild.apache.org/archiva/repository/staged-npanday/</url>
</repository>
</distributionManagement>
- <!-- TODO: need to get these into central after 1.1 -->
<pluginRepositories>
<pluginRepository>
- <id>npanday.releases</id>
- <name>NPanday Releases Repository</name>
- <url>${npanday.releases.url}</url>
+ <id>npanday.group</id>
+ <name>NPanday Group Repository</name>
+ <url>http://repo.npanday.org/archiva/repository/npanday-group</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
@@ -600,26 +598,12 @@ under the License.
</pluginRepositories>
<repositories>
<repository>
- <id>npanday.releases</id>
- <name>NPanday Releases Repository</name>
- <url>${npanday.releases.url}</url>
+ <id>npanday.group</id>
+ <name>NPanday Group Repository</name>
+ <url>http://repo.npanday.org/archiva/repository/npanday-group</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
- <!-- Additional repositories needed on first build-->
- <repository>
- <id>npanday.3rdparty</id>
- <name>NPanday 3rd-Party Repository</name>
- <url>http://repo.npanday.org/archiva/repository/3rdparty</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>aduna.org</id>
- <url>http://repository.aduna-software.org/maven2</url>
- </repository>
-
</repositories>
-</project>
+</project>
\ No newline at end of file
