GERONIMO-6546 upgrade versions to 2.0
* also removed unused site which still was owb specific
git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk@1696744 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-jcdi_2.0_spec/NOTICE b/geronimo-jcdi_2.0_spec/NOTICE
index 56fd60d..e9521b0 100644
--- a/geronimo-jcdi_2.0_spec/NOTICE
+++ b/geronimo-jcdi_2.0_spec/NOTICE
@@ -1,6 +1,6 @@
-Apache Geronimo JSR-299 Context and Dependency Injection for the Java EE Platoform Spec API
-Copyright 2009-2014 The Apache Software Foundation
+Apache Geronimo JSR-265 Context and Dependency Injection 2.0 Spec API
+Copyright 2009-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/geronimo-jcdi_2.0_spec/pom.xml b/geronimo-jcdi_2.0_spec/pom.xml
index 4739244..be97dc4 100644
--- a/geronimo-jcdi_2.0_spec/pom.xml
+++ b/geronimo-jcdi_2.0_spec/pom.xml
@@ -25,13 +25,13 @@
</parent>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
<packaging>bundle</packaging>
- <name>Apache Geronimo JCDI Spec 1.1</name>
- <version>1.1-SNAPSHOT</version>
+ <name>Apache Geronimo JCDI Spec 2.0</name>
+ <version>1.0-alpha-1-SNAPSHOT</version>
<description>
- Apache Geronimo implementation of the JSR-346 Context and Dependency Injection 1.1 & 1.2 Specification
+ Apache Geronimo implementation of the JSR-365 Context and Dependency Injection 2.0 Specification
</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
@@ -47,9 +47,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jcdi_1.1_spec/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jcdi_1.1_spec/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jcdi_1.1_spec/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/</url>
</scm>
<!-- added so the build can find staged depends -->
@@ -106,11 +106,11 @@
<configuration>
<instructions>
<Export-Package>
- javax.decorator*;version=1.0,
- javax.enterprise.context*;version=1.0,
- javax.enterprise.event*;version=1.0,
- javax.enterprise.inject*;version=1.0,
- javax.enterprise.util*;version=1.0
+ javax.decorator*;version=2.0,
+ javax.enterprise.context*;version=2.0,
+ javax.enterprise.event*;version=2.0,
+ javax.enterprise.inject*;version=2.0,
+ javax.enterprise.util*;version=2.0
</Export-Package>
</instructions>
</configuration>
diff --git a/geronimo-jcdi_2.0_spec/src/site/apt/index.apt b/geronimo-jcdi_2.0_spec/src/site/apt/index.apt
deleted file mode 100644
index baa565c..0000000
--- a/geronimo-jcdi_2.0_spec/src/site/apt/index.apt
+++ /dev/null
@@ -1,16 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one or more
-~~ contributor license agreements. See the NOTICE file distributed with this
-~~ work for additional information regarding copyright ownership. The ASF
-~~ licenses this file to You under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance with the License.
-~~ You may obtain a copy of the License at
-~~ http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
-~~ or agreed to in writing, software distributed under the License is
-~~ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the specific language
-~~ governing permissions and limitations under the License.
-OpenWebBeans API
-
- Application Programming Interface for the JSR-299
- Java Contexts and Dependency Injection.
-
diff --git a/geronimo-jcdi_2.0_spec/src/site/site.xml b/geronimo-jcdi_2.0_spec/src/site/site.xml
deleted file mode 100644
index c189c77..0000000
--- a/geronimo-jcdi_2.0_spec/src/site/site.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
--->
-
-<project name="OpenWebBeans-API">
-<!--
- <bannerLeft>
- <name>Apache OpenWebBeans</name>
- <src>http://incubator.apache.org/openwebbeans/images/openwebbeans.png</src>
- <href>http://incubator.apache.org/openwebbeans</href>
- </bannerLeft>
-
- <bannerRight>
- <name>Apache Banner</name>
- <src>http://incubator.apache.org/openwebbeans/images/apache-incubator-logo.png</src>
- <href>http://incubator.apache.org/openwebbeans</href>
- </bannerRight>
- -->
- <publishDate format="dd MMM yyyy" />
- <version position="left"/>
-
- <body>
- <breadcrumbs>
- <item name="Incubator" href="http://incubator.apache.org"/>
- <item name="OpenWebBeans" href="http://incubator.apache.org/openwebbeans"/>
- <item name="API" href="http://incubator.apache.org/openwebbeans/${project.version}/openwebbeans-api"/>
- </breadcrumbs>
-
- <menu name="Overview">
- <item name="Introduction" href="index.html" />
- </menu>
-
- <menu ref="reports"/>
- </body>
-</project>
-
diff --git a/pom.xml b/pom.xml
index 8fa6275..7ba6a45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
<module>geronimo-jcache_1.0_spec</module>
<module>geronimo-jcdi_1.0_spec</module>
<module>geronimo-jcdi_1.1_spec</module>
+ <module>geronimo-jcdi_2.0_spec</module>
<module>geronimo-jms_1.1_spec</module>
<module>geronimo-jpa_1.0_spec</module>
<module>geronimo-jpa_2.0_spec</module>
