[jboss-cvs] JBossAS SVN: r110871 - in projects/security/security-negotiation/trunk: assembly and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 9 14:49:18 EST 2011
Author: darran.lofthouse at jboss.com
Date: 2011-03-09 14:49:18 -0500 (Wed, 09 Mar 2011)
New Revision: 110871
Modified:
projects/security/security-negotiation/trunk/
projects/security/security-negotiation/trunk/assembly/pom.xml
projects/security/security-negotiation/trunk/docs/userguide/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-net/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml
projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml
projects/security/security-negotiation/trunk/parent/pom.xml
projects/security/security-negotiation/trunk/pom.xml
Log:
Move versions for the 2.1.1 release.
Property changes on: projects/security/security-negotiation/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /projects/security/security-negotiation/branches/security-negotiation-2.1.0.GA:110867-110868
/projects/security/security-negotiation/tags/security-negotiation-2.1.0.GA:110870
Modified: projects/security/security-negotiation/trunk/assembly/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/assembly/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/assembly/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: projects/security/security-negotiation/trunk/docs/userguide/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/docs/userguide/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/docs/userguide/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -1,19 +1,49 @@
-<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">
+<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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>documentation</artifactId>
- <version>1.0</version>
- </parent>
-
- <groupId>org.jboss.documentation</groupId>
- <artifactId>negotiation-user-guide-${translation}</artifactId>
- <version>2.0.4.SNAPSHOT</version>
- <packaging>jdocbook</packaging>
- <name>Negotiation_User_Guide_(${translation})</name>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>documentation</artifactId>
+ <version>1.0</version>
+ </parent>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+
+ <groupId>org.jboss.documentation</groupId>
+ <artifactId>negotiation-user-guide-${translation}</artifactId>
+ <version>2.1.1.SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>Negotiation_User_Guide_(${translation})</name>
+
</project>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-net/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-net/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-net/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: projects/security/security-negotiation/trunk/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/parent/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/parent/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -1,14 +1,14 @@
<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/maven-v4_0_0.xsd">
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>2</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Negotiation Parent</name>
<url>http://www.jboss.com</url>
@@ -61,28 +61,6 @@
<filtering>true</filtering>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>jboss-deploy</id>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- <phase>deploy</phase>
- </execution>
- </executions>
- <configuration>
- <groupId>jboss</groupId>
- <license>lgpl</license>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- <removeArtifactVersion>true</removeArtifactVersion>
- </configuration>
- </plugin>
- </plugins>
</build>
<repositories>
<repository>
@@ -199,8 +177,6 @@
<artifactId>jbossweb</artifactId>
<version>${version.jbossweb}</version>
</dependency>
-
-
</dependencies>
</dependencyManagement>
Modified: projects/security/security-negotiation/trunk/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/pom.xml 2011-03-09 19:37:37 UTC (rev 110870)
+++ projects/security/security-negotiation/trunk/pom.xml 2011-03-09 19:49:18 UTC (rev 110871)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-project</artifactId>
- <version>2.0.4.SNAPSHOT</version>
+ <version>2.1.1.SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
More information about the jboss-cvs-commits
mailing list