servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1364403 - in /servicemix/documentation/trunk: pom.xml src/etc/logback.xml src/main/resources/ src/main/resources/logback.xml src/main/webapp/WEB-INF/scalate/layouts/default.ssp
Date Sun, 22 Jul 2012 19:30:20 GMT
Author: gertv
Date: Sun Jul 22 19:30:19 2012
New Revision: 1364403

URL: http://svn.apache.org/viewvc?rev=1364403&view=rev
Log:
Update versions and alter publish URL to docs/4.4.x

Added:
    servicemix/documentation/trunk/src/main/resources/
    servicemix/documentation/trunk/src/main/resources/logback.xml
      - copied, changed from r1364402, servicemix/documentation/trunk/src/etc/logback.xml
Removed:
    servicemix/documentation/trunk/src/etc/logback.xml
Modified:
    servicemix/documentation/trunk/pom.xml
    servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp

Modified: servicemix/documentation/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1364403&r1=1364402&r2=1364403&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Sun Jul 22 19:30:19 2012
@@ -40,20 +40,22 @@
         <jetty-port>8080</jetty-port>
         <webapp.srcdir>${project.basedir}/src/main/webapp</webapp.srcdir>
         <webapp.dir>${project.build.directory}/webapp</webapp.dir>
-        <maven.wagon.version>1.0-beta-6</maven.wagon.version>
+        <maven.wagon.version>2.2</maven.wagon.version>
 
         <pdf.required>false</pdf.required>
 
-        <scala.version>2.9.1</scala.version>
+        <scala.version>2.9.2</scala.version>
 
         <scalate.version>1.5.3</scalate.version>
         <scalate.mode>production</scalate.mode>
         <scalate.workdir>${basedir}/target/scalateWorkDir</scalate.workdir>
 
-        <camel.version>2.8.3</camel.version>
+        <camel.version>2.8.5</camel.version>
         <components.version>2011.01</components.version>
-        <karaf.version>2.2.3</karaf.version>
+        <karaf.version>2.2.4</karaf.version>
+
         <servicemix.version>4.4.2</servicemix.version>
+        <servicemix.docs.location>4.4.x</servicemix.docs.location>
     </properties>
 
     <dependencies>
@@ -76,12 +78,12 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.24</version>
+            <version>1.0.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.6</version>
         </dependency>
 
         <!-- Scala -->
@@ -232,13 +234,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.scalate</groupId>
-            <artifactId>maven-scalate-plugin</artifactId>
-            <version>${scalate.version}</version>
+            <version>4.10</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -263,7 +259,7 @@
             <plugin>
                 <groupId>org.scala-tools</groupId>
                 <artifactId>maven-scala-plugin</artifactId>
-                <version>2.15.0</version>
+                <version>2.15.2</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -389,7 +385,7 @@
                 <configuration>
                     <warSourceDirectory>${webapp.dir}</warSourceDirectory>
                     <remoteServerId>people.apache.org</remoteServerId>
-                    <remoteServerUrl>scp://people.apache.org/www/servicemix.apache.org/docs/${servicemix.version}</remoteServerUrl>
+                    <remoteServerUrl>scp://people.apache.org/www/servicemix.apache.org/docs/${servicemix.docs.location}</remoteServerUrl>
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -401,7 +397,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.2</version>
                 <configuration>
                     <warSourceDirectory>${webapp.dir}</warSourceDirectory>
                     <archive>
@@ -412,7 +408,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>7.1.5.v20100705</version>
+                <version>7.6.5.v20120716</version>
                 <configuration>
                     <webAppConfig>
                         <contextPath>/</contextPath>
@@ -439,7 +435,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.1.0</version>
+                <version>2.3.7</version>
                 <executions>
                     <execution>
                         <id>bundle-manifest</id>
@@ -456,7 +452,7 @@
                         <supportedProjectType>war</supportedProjectType>
                     </supportedProjectTypes>
                     <instructions>
-                        <Import-Package>javax.servlet,javax.servlet.http,org.osgi.framework,org.osgi.service.packageadmin,javax.swing.tree</Import-Package>
+                        <Import-Package>javax.servlet,javax.servlet.http,org.osgi.framework,org.osgi.service.packageadmin,javax.swing.tree,*;resolution:=optional</Import-Package>
                         <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
                         <Embed-Directory>WEB-INF/lib</Embed-Directory>
                         <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
@@ -468,35 +464,6 @@
         </plugins>
     </build>
 
-    <!-- Scalate snapshots -->
-    <repositories>
-        <repository>
-            <id>fusesource.snapshots</id>
-            <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <!-- Scalate snapshots -->
-    <pluginRepositories>
-        <pluginRepository>
-            <id>fusesource.snapshots</id>
-            <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-
     <profiles>
         <profile>
             <id>apache-release</id>

Copied: servicemix/documentation/trunk/src/main/resources/logback.xml (from r1364402, servicemix/documentation/trunk/src/etc/logback.xml)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/resources/logback.xml?p2=servicemix/documentation/trunk/src/main/resources/logback.xml&p1=servicemix/documentation/trunk/src/etc/logback.xml&r1=1364402&r2=1364403&rev=1364403&view=diff
==============================================================================
    (empty)

Modified: servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp?rev=1364403&r1=1364402&r2=1364403&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp Sun
Jul 22 19:30:19 2012
@@ -82,8 +82,8 @@ limitations under the License.
                   <input name="oe" type="hidden" value="UTF-8"></input>
                   <input maxlength="255" name="q" size="15" type="text" value=""></input>
                   <input name="btnG" type="submit" value="Search"></input>
-                  <input name="domains" type="hidden" value="servicemix.apache.org/docs/4.4.0/"></input>
-                  <input name="sitesearch" type="hidden" value="servicemix.apache.org/docs/4.4.0/"></input>
+                  <input name="domains" type="hidden" value="servicemix.apache.org/docs/${servicemix.docs.location}"></input>
+                  <input name="sitesearch" type="hidden" value="servicemix.apache.org/docs/${servicemix.docs.location}"></input>
                 </form>
               </li>
             </ul>



Mime
View raw message