Commit 180a63d1 authored by Yann Mombrun's avatar Yann Mombrun
Browse files

WEBLAB-1378 - Bumbing to stable version based on parent 1.2.8

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@4097 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 798cf295
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -3,14 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.ow2.weblab.osgi</groupId>
<artifactId>weblab-camel-chains</artifactId>
......@@ -59,5 +59,5 @@
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -11,12 +11,18 @@
<prop key="karaf.http.port">8282</prop>
<prop key="tomcat.path">apache-tomcat-7.0.59</prop>
<prop key="liferay.path">liferay-portal-6.1.2-ce-ga3/tomcat-7.0.40</prop>
<prop key="karaf.path">karaf-weblab-2.0.3-SNAPSHOT</prop>
<prop key="karaf.path">karaf-weblab-2.0.3</prop>
<prop key="fuseki.path">jena-fuseki-1.0.1</prop>
<prop key="files.to.index">${weblab.data}toIndex</prop>
<prop key="warcs.to.index">${weblab.data}warcs</prop>
<prop key="content.folder">${weblab.data}content</prop>
<prop key="content.manager.opts">-Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder}</prop>
<prop key="karaf.java.opts">-server -Xms128M -Xmx1024m -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Dweblab.files=${files.to.index}?maxMessagesPerPoll=500 -Dweblab.warcs=${warcs.to.index}?maxMessagesPerPoll=500 ${content.manager.opts}</prop>
<prop key="tomcat.java.opts">-Xmx1500m -XX:MaxPermSize=256m -Dtomcat.http.port=${tomcat.http.port} -Dweblab.home=${weblab.home} -Dweblab.files=${files.to.index} -Dweblab.warcs=${warcs.to.index} -Dsolr.solr.home=${weblab.conf}solr -Dweblab.repository=${weblab.data}repository -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18181 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false ${content.manager.opts}</prop>
<prop key="liferay.java.opts">-Xmx1024m -XX:MaxPermSize=512m -Dweblab.client.url=http://localhost:${tomcat.http.port}/exposed-configuration/weblab-client.xml -Dweblab.portlet.filter.url=http://localhost:${tomcat.http.port}/exposed-configuration/weblab-portlet-filters.xml -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18080 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false ${content.manager.opts}</prop>
</props>
</property>
</bean>
......@@ -78,7 +84,7 @@
<constructor-arg>
<map>
<entry key="CATALINA_HOME" value="${weblab.home}${tomcat.path}" />
<entry key="JAVA_OPTS" value=" -Xmx1500m -XX:MaxPermSize=256m -Dtomcat.http.port=${tomcat.http.port} -Dweblab.home=${weblab.home} -Dweblab.files=${files.to.index} -Dweblab.warcs=${warcs.to.index} -Dsolr.solr.home=${weblab.conf}solr -Dweblab.repository=${weblab.data}repository -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18181 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder}" />
<entry key="JAVA_OPTS" value=" ${tomcat.java.opts} " />
</map>
</constructor-arg>
</bean>
......@@ -109,7 +115,7 @@
<map>
<entry key="CATALINA_HOME" value="${weblab.home}${liferay.path}" />
<!-- <entry key="CATALINA_PID" value="${weblab.data}pids/liferay.pid" /> -->
<entry key="JAVA_OPTS" value=" -Xmx1024m -XX:MaxPermSize=512m -Dweblab.client.url=http://localhost:${tomcat.http.port}/exposed-configuration/weblab-client.xml -Dweblab.portlet.filter.url=http://localhost:${tomcat.http.port}/exposed-configuration/weblab-portlet-filters.xml -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18080 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder}" />
<entry key="JAVA_OPTS" value=" ${liferay.java.opts} " />
</map>
</constructor-arg>
</bean>
......@@ -141,7 +147,7 @@
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="JAVA_OPTS" value=" -server -Xms128M -Xmx1024m -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Dweblab.files=${files.to.index}?maxMessagesPerPoll=500 -Dweblab.warcs=${warcs.to.index}?maxMessagesPerPoll=500 -Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder} " />
<entry key="JAVA_OPTS" value=" ${karaf.java.opts} " />
</map>
</constructor-arg>
</bean>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......@@ -19,7 +19,7 @@
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>content-manager</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>2.2.0</version>
<type>jar</type>
</dependency>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -4,17 +4,17 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<groupId>org.ow2.weblab.bundle.servers</groupId>
<artifactId>activemq-manager</artifactId>
<packaging>jar</packaging>
<name>WebLab manager for ActiveMQ server.</name>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.bundle</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
......@@ -14,7 +14,7 @@
<packaging>jar</packaging>
<name>WebLab manager for Fuseki server.</name>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.bundle</groupId>
......
......@@ -5,7 +5,7 @@
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<relativePath>../../../pom.xml</relativePath>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
</parent>
<groupId>org.ow2.weblab.bundle.servers</groupId>
......@@ -14,7 +14,7 @@
<packaging>jar</packaging>
<name>WebLab manager for Heritrix server.</name>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.bundle</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
......@@ -14,7 +14,7 @@
<packaging>jar</packaging>
<name>WebLab manager for Karaf OSGi plateform.</name>
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......
......@@ -3,7 +3,7 @@
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.3</version>
<packaging>pom</packaging>
......@@ -37,16 +37,16 @@
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
<!-- WebLab dependencies -->
<weblab.model.version>1.2.8-SNAPSHOT</weblab.model.version>
<weblab.model.version>1.2.8</weblab.model.version>
<weblab.extended.version>${weblab.model.version}</weblab.extended.version>
<weblab.annotator.version>${weblab.model.version}</weblab.annotator.version>
<weblab.bundle.version>${project.version}</weblab.bundle.version>
<weblab.rdf-helper-jena.version>1.5.0-SNAPSHOT</weblab.rdf-helper-jena.version>
<weblab.rdf-helper-jena-structure.version>1.5.0-SNAPSHOT</weblab.rdf-helper-jena-structure.version>
<weblab.rdf-helper-jena.version>1.5.0</weblab.rdf-helper-jena.version>
<weblab.rdf-helper-jena-structure.version>1.5.0</weblab.rdf-helper-jena-structure.version>
<weblab.content-manager.version>2.2.0-SNAPSHOT</weblab.content-manager.version>
<weblab.content-manager.version>2.2.0</weblab.content-manager.version>
<!-- Servers versions -->
<tomcat.version>7.0.59</tomcat.version>
......@@ -87,23 +87,23 @@
<json-simple.version>1.1</json-simple.version>
<!-- Services versions -->
<service.simple-file-repository.version>1.5.0-SNAPSHOT</service.simple-file-repository.version>
<service.tika-normaliser.version>2.2.0-SNAPSHOT</service.tika-normaliser.version>
<service.simple-gazetteer.version>1.4.0-SNAPSHOT</service.simple-gazetteer.version>
<service.ngramj-language-extraction.version>1.6.0-SNAPSHOT</service.ngramj-language-extraction.version>
<service.gate-extraction.version>2.6.0-SNAPSHOT</service.gate-extraction.version>
<service.solr-engine.version>2.6.0-SNAPSHOT</service.solr-engine.version>
<service.simple-file-repository.version>1.5.0</service.simple-file-repository.version>
<service.tika-normaliser.version>2.2.0</service.tika-normaliser.version>
<service.simple-gazetteer.version>1.4.0</service.simple-gazetteer.version>
<service.ngramj-language-extraction.version>1.6.0</service.ngramj-language-extraction.version>
<service.gate-extraction.version>2.6.0</service.gate-extraction.version>
<service.solr-engine.version>2.6.0</service.solr-engine.version>
<service.solr.version>4.10.0</service.solr.version>
<solr.config.version>0.0.1</solr.config.version>
<!-- Portlets versions -->
<portlet.result-portlet.version>2.1.0-SNAPSHOT</portlet.result-portlet.version>
<portlet.document-viewer-portlet.version>2.1.0-SNAPSHOT</portlet.document-viewer-portlet.version>
<portlet.search-portlet.version>1.7.0-SNAPSHOT</portlet.search-portlet.version>
<portlet.metadata-portlet.version>2.2.0-SNAPSHOT</portlet.metadata-portlet.version>
<portlet.facet-portlet.version>1.7.0-SNAPSHOT</portlet.facet-portlet.version>
<portlet.result-portlet.version>2.1.0</portlet.result-portlet.version>
<portlet.document-viewer-portlet.version>2.1.0</portlet.document-viewer-portlet.version>
<portlet.search-portlet.version>1.7.0</portlet.search-portlet.version>
<portlet.metadata-portlet.version>2.2.0</portlet.metadata-portlet.version>
<portlet.facet-portlet.version>1.7.0</portlet.facet-portlet.version>
<portlet.weblab-theme.version>2.0.0</portlet.weblab-theme.version>
<portlet.application-installer.version>2.0.3-SNAPSHOT</portlet.application-installer.version>
<portlet.application-installer.version>2.0.3</portlet.application-installer.version>
<!-- Liferay common libraries -->
<taglib.version>1.1.2</taglib.version>
......@@ -197,6 +197,11 @@
<artifactId>maven-resources-plugin</artifactId>
<version>${maven.resources-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
</plugin>
</plugins>
</pluginManagement>
......@@ -209,6 +214,40 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>1.7.0</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-no-snapshots</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireReleaseDeps>
<onlyWhenRelease>true</onlyWhenRelease>
<message>No Snapshots Allowed when version is stable!</message>
</requireReleaseDeps>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment