Author: jfrederic.clere(a)jboss.com Date: 2011-12-20 11:42:29 -0500 (Tue, 20 Dec 2011) New Revision: 1900 Removed: tags/JBOSSWEB_2_1_13_TEST/res/maven/ Modified: tags/JBOSSWEB_2_1_13_TEST/build.properties.default tags/JBOSSWEB_2_1_13_TEST/dist.xml tags/JBOSSWEB_2_1_13_TEST/res/el-api-pom.xml tags/JBOSSWEB_2_1_13_TEST/res/jasper-jdt-pom.xml tags/JBOSSWEB_2_1_13_TEST/res/jbossweb-pom.xml tags/JBOSSWEB_2_1_13_TEST/res/jsp-api-pom.xml tags/JBOSSWEB_2_1_13_TEST/res/servlet-api-pom.xml Log: Fix the maven/nexus new requirements, Modified: tags/JBOSSWEB_2_1_13_TEST/build.properties.default =================================================================== --- tags/JBOSSWEB_2_1_13_TEST/build.properties.default 2011-12-20 11:32:47 UTC (rev 1899) +++ tags/JBOSSWEB_2_1_13_TEST/build.properties.default 2011-12-20 16:42:29 UTC (rev 1900) @@ -12,15 +12,15 @@ # ----- Version Control Flags ----- version.major=2 version.minor=1 -version.build=12 +version.build=13 version.patch=0 -version.tag=SNAPSHOT +version.tag=TEST # ----- Default Base Path for Dependent Packages ----- # Please note this path must be absolute, not relative, # as it is referenced with different working directory # contexts by the various build scripts. -base.path=/usr/share/java +base.path=/home/jfclere/java #base.path=C:/path/to/the/repository #base.path=/usr/local Modified: tags/JBOSSWEB_2_1_13_TEST/dist.xml =================================================================== --- tags/JBOSSWEB_2_1_13_TEST/dist.xml 2011-12-20 11:32:47 UTC (rev 1899) +++ tags/JBOSSWEB_2_1_13_TEST/dist.xml 2011-12-20 16:42:29 UTC (rev 1900) @@ -299,71 +299,45 @@ <!-- Linux/Unix execs --> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=el-api -Dversion=${version} -Dclassifier=sources"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=servlet-api -Dversion=${version} -Dclassifier=sources"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jsp-api -Dversion=${version} -Dclassifier=sources"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jasper-jdt -Dversion=${version} -Dclassifier=sources"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=el-api -Dversion=${version} -Dclassifier=sources"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=servlet-api -Dversion=${version} -Dclassifier=sources"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jsp-api -Dversion=${version} -Dclassifier=sources"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/> </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jasper-jdt -Dversion=${version} -Dclassifier=sources"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgeneratePom=false"/> </exec> - <!-- Windows exec --> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> - </exec> - </target> <!-- Packages the core zip distro --> Modified: tags/JBOSSWEB_2_1_13_TEST/res/el-api-pom.xml =================================================================== --- tags/JBOSSWEB_2_1_13_TEST/res/el-api-pom.xml 2011-12-20 11:32:47 UTC (rev 1899) +++ tags/JBOSSWEB_2_1_13_TEST/res/el-api-pom.xml 2011-12-20 16:42:29 UTC (rev 1900) @@ -4,4 +4,24 @@ <groupId>jboss.web</groupId> <artifactId>el-api</artifactId> <version>@VERSION@</version> + <description>Expression language package</description> + <name>el-api</name> + <packaging>pom</packaging> + <url>http://jboss.org/jbossweb</url> + <scm> + <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url> + </scm> + <developers> + <developer> + <id>JBossWeb developers</id> + </developer> + <developer> + <id>ASF Tomcat developers</id> + </developer> + </developers> + <licenses> + <license> + <name>GNU GPL Version 3</name> + </license> + </licenses> </project> Modified: tags/JBOSSWEB_2_1_13_TEST/res/jasper-jdt-pom.xml =================================================================== --- tags/JBOSSWEB_2_1_13_TEST/res/jasper-jdt-pom.xml 2011-12-20 11:32:47 UTC (rev 1899) +++ tags/JBOSSWEB_2_1_13_TEST/res/jasper-jdt-pom.xml 2011-12-20 16:42:29 UTC (rev 1900) @@ -4,4 +4,26 @@ <groupId>jboss.web</groupId> <artifactId>jasper-jdt</artifactId> <version>@VERSION@</version> + <description>Jasper javac compiler extension for Eclipse JDT</description> + <name>jasper-jdt</name> + <url>http://jboss.org/jbossweb</url> + <scm> + <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url> + </scm> + <developers> + <developer> + <id>JBossWeb developers</id> + </developer> + <developer> + <id>ASF Tomcat developers</id> + </developer> + <developer> + <id>Eclipse developers</id> + </developer> + </developers> + <licenses> + <license> + <name>GNU GPL Version 3</name> + </license> + </licenses> </project> Modified: tags/JBOSSWEB_2_1_13_TEST/res/jbossweb-pom.xml =================================================================== --- tags/JBOSSWEB_2_1_13_TEST/res/jbossweb-pom.xml 2011-12-20 11:32:47 UTC (rev 1899) +++ tags/JBOSSWEB_2_1_13_TEST/res/jbossweb-pom.xml 2011-12-20 16:42:29 UTC (rev 1900) @@ -4,4 +4,23 @@ <groupId>jboss.web</groupId> <artifactId>jbossweb</artifactId> <version>@VERSION@</version> + <description>JBossWeb jar bundle</description> + <name>jbossweb</name> + <url>http://jboss.org/jbossweb</url> + <scm> + <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url> + </scm> + <developers> + <developer> + <id>JBossWeb developers</id> + </developer> + <developer> + <id>ASF Tomcat developers</id> + </developer> + </developers> + <licenses> + <license> + <name>GNU GPL Version 3</name> + </license> + </licenses> </project> Modified: tags/JBOSSWEB_2_1_13_TEST/res/jsp-api-pom.xml =================================================================== --- tags/JBOSSWEB_2_1_13_TEST/res/jsp-api-pom.xml 2011-12-20 11:32:47 UTC (rev 1899) +++ tags/JBOSSWEB_2_1_13_TEST/res/jsp-api-pom.xml 2011-12-20 16:42:29 UTC (rev 1900) @@ -4,4 +4,23 @@ <groupId>jboss.web</groupId> <artifactId>jsp-api</artifactId> <version>@VERSION@</version> + <description>JSP package</description> + <name>jsp-api</name> + <url>http://jboss.org/jbossweb</url> + <scm> + <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url> + </scm> + <developers> + <developer> + <id>JBossWeb developers</id> + </developer> + <developer> + <id>ASF Tomcat developers</id> + </developer> + </developers> + <licenses> + <license> + <name>GNU GPL Version 3</name> + </license> + </licenses> </project> Modified: tags/JBOSSWEB_2_1_13_TEST/res/servlet-api-pom.xml =================================================================== --- tags/JBOSSWEB_2_1_13_TEST/res/servlet-api-pom.xml 2011-12-20 11:32:47 UTC (rev 1899) +++ tags/JBOSSWEB_2_1_13_TEST/res/servlet-api-pom.xml 2011-12-20 16:42:29 UTC (rev 1900) @@ -4,4 +4,23 @@ <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> <version>@VERSION@</version> + <description>javax.servlet package</description> + <name>servlet-api</name> + <url>http://jboss.org/jbossweb</url> + <scm> + <url>http://fisheye.jboss.org/browse/jbossweb/branches/2.1.x</url> + </scm> + <developers> + <developer> + <id>JBossWeb developers</id> + </developer> + <developer> + <id>ASF Tomcat developers</id> + </developer> + </developers> + <licenses> + <license> + <name>GNU GPL Version 3</name> + </license> + </licenses> </project>