Change source of Jetty, add Aries and Atmosphere

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 91b312750ded306cea7b73627934ccca7c7c3905..f2c5e493b763fccdc9b371f8a18bb7528c9e4685 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.23.r201903191635\r
+Bundle-Version: 2.1.24.SNAPSHOT-r201904221028\r
 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version\r
  ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi\r
  ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or\r

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index b75407e895e48dd30193022f7588edbef61a0285..0a6d3c2424a306fc26c49ca91c7ae5b7a8ade6cc 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -325,6 +325,11 @@
                </bean>
        </flow:flow>
 
+       <bean id="org.apache.aries.util" parent="template.ariesMaven"
+               p:sourceCoords="org.apache.aries:org.apache.aries.util:1.1.3" />
+       <bean id="org.apache.aries.spifly.dynamic.bundle"
+               parent="template.ariesMaven"
+               p:sourceCoords="org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.2.1" />
 
        <!-- Templates -->
        <bean id="template.apacheMaven" parent="template.mavenWrapper"
@@ -345,4 +350,14 @@
                                static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
        </bean>
+
+       <bean id="template.ariesMaven" parent="template.mavenWrapper"
+               abstract="true">
+               <property name="groupId" value="org.argeo.tp.apache" />
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 9f55b2ea8cedd401796fdc65043a0142e3eba3f4..73c60d04c022e821013434c1f2bb9409f5d660ad 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -14,15 +14,14 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp:2.1.23" />
+                       value="org.argeo.tp:argeo-tp:2.1.24-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
-                               <!-- <ref bean="javax.inject" /> -->
                                <ref bean="javax.jcr" />
                                <ref bean="javax.transaction" />
                                <ref bean="javax.mail" />
-                               <!-- <ref bean="javax.annotation" /> -->
+                               <ref bean="javax.websocket" />
 
                                <!-- Builder -->
                                <ref bean="biz.aQute.bnd" />
@@ -58,6 +57,8 @@
                                <ref bean="org.apache.mina.core" />
                                <ref bean="apache/org.apache.sshd" />
                                <ref bean="org.apache.tomcat.jni" />
+                               <ref bean="org.apache.aries.util" />
+                               <ref bean="org.apache.aries.spifly.dynamic.bundle" />
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -83,12 +84,12 @@
                                <ref bean="com.google.gson" />
 
                                <!-- Eclipse -->
-                               <!-- <ref bean="eclipse/org.argeo.tp.jetty" /> -->
+                               <ref bean="eclipse/org.argeo.tp.jetty" />
                                <ref bean="eclipse/org.argeo.tp.equinox" />
                                <ref bean="eclipse/org.argeo.tp.gemini" />
 
-                               <!-- Eclipse RAP -->
-                               <!-- <ref bean="eclipse/org.argeo.tp.rap.platform" /> -->
+                               <!-- Web -->
+                               <ref bean="org.atmosphere.runtime" />
 
                                <!-- Jackrabbit -->
                                <ref bean="apache/org.apache.tika" />
@@ -111,7 +112,7 @@
                                <ref bean="org.jsoup" />
                                <ref bean="misc/com.vladsch.flexmark" />
                                <ref bean="org.freemarker" />
-                               
+
                                <!-- Databases -->
                                <ref bean="org.postgresql.jdbc42" />
                                <ref bean="org.h2" />
@@ -128,7 +129,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.23" />
+                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.24-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -140,7 +141,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.23" />
+                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.24-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -152,7 +153,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.23" />
+                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.24-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 32648affc4cd5aea32406e167dc1f10709e74f1f..6cb14a0c06f0cfe2a7b74b86f4159a1683cad50b 100644 (file)
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -36,7 +36,7 @@
                                        <entry key="plugins/javax.el*.jar" value="org.argeo.tp.javax" />
 
                                        <!-- Jetty -->
-                                       <entry key="plugins/org.eclipse.jetty*.jar" value="org.argeo.tp.jetty" />
+<!--                                   <entry key="plugins/org.eclipse.jetty*.jar" value="org.argeo.tp.jetty" /> -->
 
                                        <!-- Felix -->
                                        <entry key="plugins/org.apache.felix.gogo.*.jar" value="org.argeo.tp.apache.felix" />

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index d1b48f3c8c99e3185f075e4018971328155fabdc..69a4207344eee9c7b090d20519de2b856c203861 100644 (file)
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -1,77 +1,169 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:flow="http://www.argeo.org/schema/slc-flow"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
-       <flow:flow name="eclipse/org.argeo.tp.jetty" parent="template.importJettyZip">
-               <flow:arg name="jettyVersion" value="9.4.12.v20180830" />
+
+       <flow:flow name="eclipse/org.argeo.tp.jetty"
+               spec="spec.version">
+               <flow:arg name="version" value="9.4.17.v20190418" />
+               <bean id="org.eclipse.jetty.client" parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-client:@{version}" />
+               <bean id="org.eclipse.jetty.continuation"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-continuation:@{version}" />
+               <bean id="org.eclipse.jetty.http" parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-http:@{version}" />
+               <bean id="org.eclipse.jetty.io" parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-io:@{version}" />
+               <bean id="org.eclipse.jetty.security"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-security:@{version}" />
+               <bean id="org.eclipse.jetty.jmx" parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-jmx:@{version}" />
+               <bean id="org.eclipse.jetty.server" parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-server:@{version}" />
+               <bean id="org.eclipse.jetty.servlet" parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-servlet:@{version}" />
+               <bean id="org.eclipse.jetty.util" parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-util:@{version}" />
+               <bean id="org.eclipse.jetty.servlets"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-servlets:@{version}" />
+               <bean id="org.eclipse.jetty.xml" parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-xml:@{version}" />
+
+               <!-- WebSocket -->
+               <bean id="org.eclipse.jetty.websocket.api"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.websocket:websocket-api:@{version}" />
+               <bean id="org.eclipse.jetty.websocket.common"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.websocket:websocket-common:@{version}" />
+               <bean id="org.eclipse.jetty.websocket.client"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.websocket:websocket-client:@{version}" />
+               <bean id="org.eclipse.jetty.websocket.server"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.websocket:websocket-server:@{version}" />
+               <bean id="org.eclipse.jetty.websocket.servlet"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.websocket:websocket-servlet:@{version}" />
+               <bean id="org.eclipse.jetty.websocket.javax.websocket"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.websocket:javax-websocket-client-impl:@{version}" />
+               <bean id="org.eclipse.jetty.websocket.javax.websocket.server"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.websocket:javax-websocket-server-impl:@{version}" />
+
+               <!-- ALPN -->
+               <bean id="org.eclipse.jetty.alpn.api"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715" />
+               <bean id="org.eclipse.jetty.alpn.client"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-alpn-client:@{version}" />
+               <bean id="org.eclipse.jetty.alpn.server"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty:jetty-alpn-server:@{version}" />
+
+               <!-- HTTP/2 -->
+               <bean id="org.eclipse.jetty.http2.common"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.http2:http2-common:@{version}" />
+               <bean id="org.eclipse.jetty.http2.client"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.http2:http2-client:@{version}" />
+               <bean id="org.eclipse.jetty.http2.client.http"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.http2:http2-http-client-transport:@{version}" />
+               <bean id="org.eclipse.jetty.http2.server"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.http2:http2-server:@{version}" />
+               <bean id="org.eclipse.jetty.http2.hpack"
+                       parent="template.jettyMaven"
+                       p:sourceCoords="org.eclipse.jetty.http2:http2-hpack:@{version}" />
+
        </flow:flow>
 
-       <!-- Jetty specs and templates -->
-       <flow:spec id="jettyVersion.spec">
-               <flow:primitive name="jettyVersion" isParameter="true" />
-       </flow:spec>
 
-       <flow:flow id="template.importJettyZip" spec="jettyVersion.spec"
+       <bean id="template.jettyMaven" parent="template.mavenWrapper"
                abstract="true">
-               <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-                       <property name="uri"
-                               value="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/@{jettyVersion}/jetty-distribution-@{jettyVersion}.zip" />
-                       <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-                       </property>
-                       <property name="includes">
-                               <map>
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-continuation-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-http-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
-                                               value="org.argeo.tp.jetty" />
-                               </map>
-                       </property>
-                       <property name="excludes">
-                               <list>
-                                       <value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value>
-                               </list>
-                       </property>
-<!--                   <property name="sourcesProvider"> -->
-<!--                           <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
-<!--                                   <property name="uri" -->
-<!--                                           value="https://github.com/eclipse/jetty.project/archive/jetty-@{jettyVersion}.zip" /> -->
-<!--                                   <property name="osgiFactory" ref="osgiFactory" /> -->
-<!--                           </bean> -->
-<!--                   </property> -->
-                       <property name="osgiFactory" ref="osgiFactory" />
-               </bean>
-       </flow:flow>
+               <property name="groupId" value="org.argeo.tp.jetty" />
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
+
+
+       <!-- <flow:flow name="eclipse/org.argeo.tp.jetty" -->
+       <!-- parent="template.importJettyZip"> -->
+       <!-- <flow:arg name="jettyVersion" value="9.4.12.v20180830" /> -->
+       <!-- </flow:flow> -->
+
+       <!-- <flow:spec id="jettyVersion.spec"> -->
+       <!-- <flow:primitive name="jettyVersion" isParameter="true" /> -->
+       <!-- </flow:spec> -->
+
+       <!-- <flow:flow id="template.importJettyZip" -->
+       <!-- spec="jettyVersion.spec" abstract="true"> -->
+       <!-- <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> -->
+       <!-- <property name="uri" -->
+       <!-- value="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/@{jettyVersion}/jetty-distribution-@{jettyVersion}.zip" 
+               /> -->
+       <!-- <property name="license"> -->
+       <!-- <util:constant -->
+       <!-- static-field="org.argeo.slc.repo.FreeLicense.APACHE" /> -->
+       <!-- </property> -->
+       <!-- <property name="includes"> -->
+       <!-- <map> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-continuation-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-http-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- <entry -->
+       <!-- key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar" -->
+       <!-- value="org.argeo.tp.jetty" /> -->
+       <!-- </map> -->
+       <!-- </property> -->
+       <!-- <property name="excludes"> -->
+       <!-- <list> -->
+       <!-- <value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value> -->
+       <!-- </list> -->
+       <!-- </property> -->
+       <!-- <property name="osgiFactory" ref="osgiFactory" /> -->
+       <!-- </bean> -->
+       <!-- </flow:flow> -->
 
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 3f439f7c97c19bd0b3ebdd6e3fccf4d3536e34d8..046b2221f6443d60f7115f671501eff75dcd1978 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -70,6 +70,12 @@
                </property>
        </bean>
 
+       <bean id="javax.websocket"
+               p:sourceCoords="javax.websocket:javax.websocket-api:1.1"
+               parent="template.mavenJavax">
+               <property name="doNotModify" value="true" />
+       </bean>
+
        <!-- Templates -->
        <bean name="template.mavenJavax" p:groupId="org.argeo.tp.javax"
                abstract="true" parent="template.mavenWrapper" />

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 0cdf1ead4ff50bb8a3a5a90efae45f31f20b03ce..204eb3c1fac134709bab597cb183ec7266fe73bc 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -98,8 +98,16 @@
                </property>
        </bean>
 
-       <bean id="org.objectweb.asm" p:version="3.1.0"
-               p:sourceCoords="org.eclipse.jetty.orbit:org.objectweb.asm:3.1.0.v200803061910"
+       <!-- <bean id="org.objectweb.asm" p:version="3.1.0" -->
+       <!-- p:sourceCoords="org.eclipse.jetty.orbit:org.objectweb.asm:3.1.0.v200803061910" -->
+       <!-- parent="template.mavenWrapper"> -->
+       <!-- <property name="license"> -->
+       <!-- <util:constant -->
+       <!-- static-field="org.argeo.slc.repo.FreeLicense.BSD" /> -->
+       <!-- </property> -->
+       <!-- </bean> -->
+       <bean id="org.objectweb.asm" p:doNotModify="true"
+               p:sourceCoords="org.ow2.asm:asm-all:5.0.4"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant
@@ -353,7 +361,8 @@
                <property name="doNotModify" value="true" />
        </bean>
 
-       <bean id="org.freemarker" p:sourceCoords="org.freemarker:freemarker:2.3.28"
+       <bean id="org.freemarker"
+               p:sourceCoords="org.freemarker:freemarker:2.3.28"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant
@@ -372,4 +381,15 @@
                <property name="doNotModify" value="true" />
        </bean>
 
+       <bean id="org.atmosphere.runtime"
+               p:sourceCoords="org.atmosphere:atmosphere-runtime:2.5.2"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
+
+
 </beans>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index eb6058671bbaf13194b1ba27bf94b351b7d246b8..3c27ff3e3adf31fb4116d80350d514e0dc2ed507 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.23</version>
+       <version>2.1.24-SNAPSHOT</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>