From 9540d670600b496b3e815fc31961b1b3c70cdc8a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 31 Jan 2011 10:04:37 +0000 Subject: [PATCH] Initiate next development cycle git-svn-id: https://svn.argeo.org/commons/trunk@4117 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- pom.xml | 3 ++- .../demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF | 2 +- .../org.argeo.security.manager.ldap/META-INF/MANIFEST.MF | 2 +- .../modules/org.argeo.security.services/META-INF/MANIFEST.MF | 2 +- .../modules/org.argeo.security.webapp/META-INF/MANIFEST.MF | 2 +- server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF | 2 +- .../demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF | 2 +- server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF | 2 +- .../org.argeo.server.activemq.broker/META-INF/MANIFEST.MF | 2 +- .../modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF | 2 +- server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF | 2 +- .../org.argeo.server.ext.jackrabbit/META-INF/MANIFEST.MF | 2 +- server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF | 2 +- .../org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF | 2 +- .../org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF | 2 +- server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF | 2 +- server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF | 2 +- .../org.argeo.server.tika.jackrabbit/META-INF/MANIFEST.MF | 2 +- server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF | 2 +- .../modules/org.argeo.server.webextender/META-INF/MANIFEST.MF | 2 +- server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF | 2 +- 21 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 7c1392b0f..410c25c9c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 0.2 1.1.2 - 0.2.2 + 0.2.3-SNAPSHOT 0.12.5 3.6.1 0.1.30 @@ -194,6 +194,7 @@ limitations under the License. org.apache.maven.plugins maven-release-plugin + 2.1 true release diff --git a/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF b/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF index f87016809..035decd21 100644 --- a/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF +++ b/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Bundle-SymbolicName: org.argeo.security.demo.log4j -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Fragment-Host: com.springsource.org.apache.log4j diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF index 0c1f47125..f0c99dc66 100644 --- a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF +++ b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Bundle-SymbolicName: org.argeo.security.manager.ldap -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Import-Package: com.sun.jndi.ldap;resolution:=optional, org.argeo.security, org.argeo.security.ldap, diff --git a/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF index 586e1255a..50d248958 100644 --- a/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF +++ b/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Bundle-SymbolicName: org.argeo.security.services -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Import-Package: org.argeo.security, org.argeo.security.core, org.springframework.beans.factory.config;specification-version="2.5.6.SEC01", diff --git a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF index 7987e2945..90d882f7a 100644 --- a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF +++ b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Bundle-SymbolicName: org.argeo.security.webapp -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Web-ContextPath: org.argeo.security.webapp Import-Package: javax.servlet, javax.servlet.http, diff --git a/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF index a941ae920..b4b73ee61 100644 --- a/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF +++ b/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Bundle-SymbolicName: org.argeo.server.demo.log4j -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Fragment-Host: com.springsource.org.apache.log4j diff --git a/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF index 95a6397aa..21ded8d54 100644 --- a/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF +++ b/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Web-ContextPath: org.argeo.server.demo.miniwebapp Bundle-SymbolicName: org.argeo.server.demo.miniwebapp -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Import-Package: javax.servlet, javax.servlet.http, javax.servlet.jsp, diff --git a/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF index 0a2bddf4c..785444b47 100644 --- a/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF +++ b/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Web-ContextPath: org.argeo.server.osgi.monitor Bundle-SymbolicName: org.argeo.server.osgi.monitor -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Import-Package: javax.servlet, javax.servlet.http, javax.servlet.jsp, diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF index 7d80841ab..4e8b775c9 100644 --- a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-SymbolicName: org.argeo.server.activemq.broker Import-Package: ietf.params.xml.ns.xmpp_sasl;resolution:=optional, ietf.params.xml.ns.xmpp_stanzas;resolution:=optional, diff --git a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF index e9f29e57c..c89800107 100644 --- a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-SymbolicName: org.argeo.server.ads.server Import-Package: javax.naming.directory, jdbm;specification-version="1.0.0", diff --git a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF index 49b107c1c..46655dafc 100644 --- a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6 .0.16,7.0.0)" -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-SymbolicName: org.argeo.server.catalina Import-Package: org.apache.commons.logging.impl;resolution:=optional, org.argeo.security.core;resolution:=optional, diff --git a/server/modules/org.argeo.server.ext.jackrabbit/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.ext.jackrabbit/META-INF/MANIFEST.MF index 2db053ea3..87c1363ce 100644 --- a/server/modules/org.argeo.server.ext.jackrabbit/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.ext.jackrabbit/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Jackrabbit Bundle-SymbolicName: org.argeo.server.ext.jackrabbit -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Fragment-Host: org.argeo.dep.osgi.jackrabbit diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF index f9508ff46..367a01bc4 100644 --- a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-SymbolicName: org.argeo.server.hsqldb Import-Package: org.hsqldb.jdbc, org.springframework.beans.factory.config diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF index db3ecf068..3a435449c 100644 --- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Bundle-SymbolicName: org.argeo.server.jackrabbit.repo -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Import-Package: javax.jcr, org.apache.jackrabbit.core, org.apache.jackrabbit.core.config, diff --git a/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF index 1ef925fd3..7a96fd3e9 100644 --- a/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Bundle-SymbolicName: org.argeo.server.jackrabbit.webdav -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Web-ContextPath: webdav Import-Package: javax.jcr, javax.servlet, diff --git a/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF index 84e41cada..d5dcd702d 100644 --- a/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Fragment-Host: org.springframework.jdbc -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-SymbolicName: org.argeo.server.jdbc Import-Package: com.microsoft.sqlserver.jdbc;resolution:=optional, com.mysql.jdbc;resolution:=optional, diff --git a/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF index 04ac87e72..e5496dc65 100644 --- a/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Require-Bundle: org.argeo.slc.specs,org.argeo.slc.core -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-Name: Argeo SLC MySQL Bundle-SymbolicName: org.argeo.server.mysql Import-Package: com.mysql.jdbc,net.sf.ehcache.hibernate,org.hibernate, diff --git a/server/modules/org.argeo.server.tika.jackrabbit/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.tika.jackrabbit/META-INF/MANIFEST.MF index 201336787..29b00b9ff 100644 --- a/server/modules/org.argeo.server.tika.jackrabbit/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.tika.jackrabbit/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tika Jackrabbit extension Bundle-SymbolicName: org.argeo.server.tika.jackrabbit -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Fragment-Host: org.argeo.dep.osgi.tika Import-Package: org.apache.jackrabbit.core.query.pdf diff --git a/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF index e2122388b..1eadab4dc 100644 --- a/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Fragment-Host: org.argeo.dep.osgi.catalina.start -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-SymbolicName: org.argeo.server.tomcat diff --git a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF index 6e1c0b4e1..f560858bd 100644 --- a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Fragment-Host: org.springframework.osgi.web.extender -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-SymbolicName: org.argeo.server.webextender Import-Package: org.apache.catalina,org.apache.catalina.connector diff --git a/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF index e074ec498..8cfd06999 100644 --- a/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF +++ b/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Catalina Bundle-SymbolicName: org.argeo.server.catalina -Bundle-Version: 0.2.2 +Bundle-Version: 0.2.3-SNAPSHOT Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.catalina;version="6.0.24", org.apache.catalina.connector;version="6.0.24", -- 2.39.2