Updated 1.1.1 to remove the -rc so a clean build can be completed
git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/branches/1.1.1@442632 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/etc/explicit_versions.properties b/etc/explicit_versions.properties
index adf3c1b..d8b7faf 100644
--- a/etc/explicit_versions.properties
+++ b/etc/explicit_versions.properties
@@ -7,7 +7,7 @@
#
activeio///=2.0-r118
activemq///=3.2.4
-geronimo///=1.1.1-rc3
+geronimo///=1.1.1
openejb///=2.1.1
tranql/tranql//jar=1.3
tranql/connector//rar=1.2
diff --git a/etc/project.properties b/etc/project.properties
index 71a585f..172d3be 100644
--- a/etc/project.properties
+++ b/etc/project.properties
@@ -88,7 +88,7 @@
#####################################################
activeio_version=2.0-r118
activemq_version=3.2.4
-geronimo_version=1.1.1-rc3
+geronimo_version=1.1.1
openejb_version=2.1.1
tranql_version=1.3
tranql_connector_version=1.2
@@ -100,7 +100,7 @@
geronimo_deployment_plugin_version=1.1.1-3
geronimo_dependency_plugin_version=1.1.1-3
-geronimo_schema_j2ee_1_4_version=1.0-rc3
+geronimo_schema_j2ee_1_4_version=1.0
geronimo_spec_activation_version=1.1
@@ -111,7 +111,7 @@
geronimo_spec_j2ee_version=1.1
geronimo_spec_j2ee_connector_version=1.0.1
geronimo_spec_j2ee_deployment_version=1.0.1
-geronimo_spec_j2ee_jacc_version=1.1.1-rc3
+geronimo_spec_j2ee_jacc_version=1.1.1
geronimo_spec_j2ee_management_version=1.0.1
geronimo_spec_javamail_version=1.1
geronimo_spec_jaxr_version=1.0.1
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application-client_1_2.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application-client_1_2.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application-client_1_2.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application_1_2.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application_1_2.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application_1_2.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/ejb-jar_1_1.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/ejb-jar_1_1.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/ejb-jar_1_1.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-app_2_2.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-app_2_2.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-app_2_2.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-jsptaglibrary_1_1.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-jsptaglibrary_1_1.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-jsptaglibrary_1_1.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application-client_1_3.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application-client_1_3.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application-client_1_3.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application_1_3.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application_1_3.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application_1_3.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/connector_1_0.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/connector_1_0.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/connector_1_0.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/ejb-jar_2_0.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/ejb-jar_2_0.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/ejb-jar_2_0.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-app_2_3.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-app_2_3.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-app_2_3.dtd
+++ /dev/null
diff --git a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-jsptaglibrary_1_2.dtd b/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-jsptaglibrary_1_2.dtd
deleted file mode 100644
index e69de29..0000000
--- a/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-jsptaglibrary_1_2.dtd
+++ /dev/null
diff --git a/plugins/geronimo-assembly-plugin/project.properties b/plugins/geronimo-assembly-plugin/project.properties
index f2527ba..50a41b0 100644
--- a/plugins/geronimo-assembly-plugin/project.properties
+++ b/plugins/geronimo-assembly-plugin/project.properties
@@ -22,8 +22,8 @@
maven.compile.source=1.4
maven.compile.target=1.4
-geronimoVersion=1.1.1-rc3
-geronimo_version=1.1.1-rc3
+geronimoVersion=1.1.1
+geronimo_version=1.1.1
maven.multiproject.type=plugin
# set eclipse project name (used in eclipse plugin V1.11 onwards)
diff --git a/plugins/geronimo-assembly-plugin/project.xml b/plugins/geronimo-assembly-plugin/project.xml
index 997c2ee..05d95e7 100644
--- a/plugins/geronimo-assembly-plugin/project.xml
+++ b/plugins/geronimo-assembly-plugin/project.xml
@@ -45,12 +45,12 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
</dependency>
</dependencies>
diff --git a/plugins/geronimo-dependency-plugin/project.properties b/plugins/geronimo-dependency-plugin/project.properties
index dee1983..9e4f162 100644
--- a/plugins/geronimo-dependency-plugin/project.properties
+++ b/plugins/geronimo-dependency-plugin/project.properties
@@ -22,8 +22,8 @@
maven.compile.source=1.4
maven.compile.target=1.4
-geronimoVersion=1.1.1-rc3
-geronimo_version=1.1.1-rc3
+geronimoVersion=1.1.1
+geronimo_version=1.1.1
maven.multiproject.type=plugin
diff --git a/plugins/geronimo-dependency-plugin/project.xml b/plugins/geronimo-dependency-plugin/project.xml
index 5e22424..938c515 100644
--- a/plugins/geronimo-dependency-plugin/project.xml
+++ b/plugins/geronimo-dependency-plugin/project.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
</dependency>
</dependencies>
diff --git a/plugins/geronimo-deployment-plugin/project.properties b/plugins/geronimo-deployment-plugin/project.properties
index e8e87a8..436b62b 100644
--- a/plugins/geronimo-deployment-plugin/project.properties
+++ b/plugins/geronimo-deployment-plugin/project.properties
@@ -29,7 +29,7 @@
maven.multiproject.type=plugin
-geronimo_version=1.1.1-rc3
+geronimo_version=1.1.1
# set eclipse project name (used in eclipse plugin V1.11 onwards)
maven.eclipse.project.name=${geronimo.maven.eclipse.plugins.project.prefix}${pom.artifactId}
diff --git a/plugins/geronimo-izpack-plugin/project.properties b/plugins/geronimo-izpack-plugin/project.properties
index 0a30d08..9cfba7c 100644
--- a/plugins/geronimo-izpack-plugin/project.properties
+++ b/plugins/geronimo-izpack-plugin/project.properties
@@ -23,8 +23,8 @@
maven.compile.source=1.4
maven.compile.target=1.4
-geronimoVersion=1.1.1-rc3
-geronimo_version=1.1.1-rc3
+geronimoVersion=1.1.1
+geronimo_version=1.1.1
maven.multiproject.type=plugin
diff --git a/plugins/geronimo-izpack-plugin/project.xml b/plugins/geronimo-izpack-plugin/project.xml
index d29d827..8c08fbf 100644
--- a/plugins/geronimo-izpack-plugin/project.xml
+++ b/plugins/geronimo-izpack-plugin/project.xml
@@ -29,12 +29,12 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
diff --git a/plugins/geronimo-packaging-plugin/plugin.properties b/plugins/geronimo-packaging-plugin/plugin.properties
index bf6897c..ee1b482 100644
--- a/plugins/geronimo-packaging-plugin/plugin.properties
+++ b/plugins/geronimo-packaging-plugin/plugin.properties
@@ -19,7 +19,7 @@
## $Rev$ $Date$
##
-geronimo.packaging.geronimo_version=1.1.1-rc3
+geronimo.packaging.geronimo_version=1.1.1
geronimo.packaging.srcDir=${basedir}/src/plan
geronimo.packaging.planFile=plan.xml
diff --git a/plugins/geronimo-packaging-plugin/project.properties b/plugins/geronimo-packaging-plugin/project.properties
index ae86afa..d2eeafb 100644
--- a/plugins/geronimo-packaging-plugin/project.properties
+++ b/plugins/geronimo-packaging-plugin/project.properties
@@ -24,7 +24,7 @@
maven.multiproject.type=plugin
-geronimo_version=1.1.1-rc3
+geronimo_version=1.1.1
# set eclipse project name (used in eclipse plugin V1.11 onwards)
maven.eclipse.project.name=${geronimo.maven.eclipse.plugins.project.prefix}${pom.artifactId}
diff --git a/plugins/geronimo-packaging-plugin/project.xml b/plugins/geronimo-packaging-plugin/project.xml
index 0d0f5fd..36b1025 100644
--- a/plugins/geronimo-packaging-plugin/project.xml
+++ b/plugins/geronimo-packaging-plugin/project.xml
@@ -28,7 +28,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
<properties>
<packaging.classpath>true</packaging.classpath>
</properties>
@@ -37,7 +37,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
<properties>
<packaging.classpath>true</packaging.classpath>
</properties>
@@ -46,7 +46,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
<properties>
<packaging.classpath>true</packaging.classpath>
</properties>
@@ -55,7 +55,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
<properties>
<packaging.classpath>true</packaging.classpath>
</properties>
@@ -134,7 +134,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
diff --git a/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml b/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
index 28497f7..27cd6e9 100644
--- a/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
+++ b/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
@@ -18,20 +18,20 @@
<moduleId>
<groupId>geronimo</groupId>
<artifactId>system-database</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
<type>car</type>
</moduleId>
<dependencies>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-server</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
<type>car</type>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-derby</artifactId>
- <version>1.1.1-rc3</version>
+ <version>1.1.1</version>
<type>jar</type>
<import>classes</import>
</dependency>
diff --git a/plugins/geronimo-packaging-plugin/src/test-resources/result.xml b/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
index 63c2c2c..d030993 100644
--- a/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
+++ b/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
@@ -17,20 +17,20 @@
<dep:moduleId>
<dep:groupId>geronimo</dep:groupId>
<dep:artifactId>system-database</dep:artifactId>
- <dep:version>1.1.1-rc3</dep:version>
+ <dep:version>1.1.1</dep:version>
<dep:type>car</dep:type>
</dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>geronimo</dep:groupId>
<dep:artifactId>j2ee-server</dep:artifactId>
- <dep:version>1.1.1-rc3</dep:version>
+ <dep:version>1.1.1</dep:version>
<dep:type>car</dep:type>
</dep:dependency>
<dep:dependency>
<dep:groupId>geronimo</dep:groupId>
<dep:artifactId>geronimo-derby</dep:artifactId>
- <dep:version>1.1.1-rc3</dep:version>
+ <dep:version>1.1.1</dep:version>
<dep:type>jar</dep:type>
<dep:import>classes</dep:import>
</dep:dependency>
