Author: jbonofre
Date: Wed Mar 24 05:07:44 2021
New Revision: 1887988

URL: http://svn.apache.org/viewvc?rev=1887988&view=rev
Log:
[scm-publish] Updating main website contents

Modified:
    karaf/site/production/community.html
    karaf/site/production/documentation.html
    karaf/site/production/feed.xml
    karaf/site/production/news.html

Modified: karaf/site/production/community.html
URL: 
http://svn.apache.org/viewvc/karaf/site/production/community.html?rev=1887988&r1=1887987&r2=1887988&view=diff
==============================================================================
--- karaf/site/production/community.html (original)
+++ karaf/site/production/community.html Wed Mar 24 05:07:44 2021
@@ -216,14 +216,14 @@
                     <li>Do the change in a branch that is named like the jira 
issue id e.g KARAF-1234.<br/>To create this branch you can use:<br/>
                         <code>git clone 
http://github.com/apache/karaf</code><br/>
                         <code>git fetch --all</code><br/>
-                        <code>git checkout -b my-branch 
origin/master</code><br/>
+                        <code>git checkout -b my-branch origin/main</code><br/>
                         Don't forget to periodically rebase your branch:<br/>
                         <code>git pull --rebase</code><br/>
                         <code>git push GitHubUser my-branch --force</code>
                     </li>
-                    <li>PRs should be based on master. We are taking care of 
cherry picking the PR commits on target branches if needed.</li>
+                    <li>PRs should be based on main. We are taking care of 
cherry picking the PR commits on target branches if needed.</li>
                     <li>Every commit in the branch should start with the jira 
issue id like this "[KARAF-123] More details"</li>
-                    <li>If you have a group of commits related to the same 
change, please squash your commits into one and force push your branch using 
<code>git rebase -i apache/master</code></li>
+                    <li>If you have a group of commits related to the same 
change, please squash your commits into one and force push your branch using 
<code>git rebase -i apache/main</code></li>
                     <li>Test that your change works by adapting or adding 
tests.</li>
                     <li><a 
href="http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule";>Follow
 the boy scout rule to "Always leave the campground cleaner than you found 
it."</a></li>
                     <li>Make sure you do a build before doing a PR. The build 
has to be successfull :<br/>
@@ -231,7 +231,7 @@
                             mvn clean verify -Prat
                         </code>
                     </li>
-                    <li>If your PR has conflicts with the master then rebase 
the branch. PRs with conflicts are unlikely to be applied</li>
+                    <li>If your PR has conflicts with the main then rebase the 
branch. PRs with conflicts are unlikely to be applied</li>
                     <li>Do not change too much in a PR. The smaller the PR the 
easier it is to apply and the faster it will be done</li>
                     <li>Even if we are monitoring closely the PR, if you think 
your PR doesn't move forward fast enough, do not hesitate to ping in a PR 
comment to get some update.</li>
               </ul>
@@ -277,7 +277,7 @@
                         <code>> git checkout -b pr-xxx github/pr/xxx</code>
                     </li>
                     <li>Review the PR, amend, squash the commits, requesting 
changes, ... When done, add <code>LGTM</code> comment to approve the PR (or 
click on the "Approve" button on GitHub) :<br/>
-                        <code>> git rebase -i apache/master</code>
+                        <code>> git rebase -i apache/main</code>
                     </li>
                     <li>Merge the PR (it automatically closes the PR) :<br/>
                         Use the merge button on github (for committer).

Modified: karaf/site/production/documentation.html
URL: 
http://svn.apache.org/viewvc/karaf/site/production/documentation.html?rev=1887988&r1=1887987&r2=1887988&view=diff
==============================================================================
--- karaf/site/production/documentation.html (original)
+++ karaf/site/production/documentation.html Wed Mar 24 05:07:44 2021
@@ -221,21 +221,21 @@
                     <tr>
                         <td><strong>Blueprint</strong></td>
                         <td>using services with XML or annotations.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-blueprint-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-blueprint-example";
 target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Branding</strong></td>
                         <td>branding the look'n feel of the shell console for 
your own Karaf distribution.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-branding-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-branding-example";
 target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Bundle</strong></td>
                         <td>the bundle is the core deployment unit when using 
OSGi.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-bundle-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-bundle-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
@@ -243,161 +243,182 @@
                         <td><strong>Camel</strong></td>
                         <td>this example shows how to use Apache Camel in 
Karaf. Apache Camel is a integration framework,
                             allowing you to integrate several systems and 
applications all together.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-camel-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-camel-example"; 
target="_blank">
+                            <img src="/images/github.png" width="24px">
+                        </a></td>
+                    </tr>
+                    <tr>
+                        <td><strong>CDI</strong></td>
+                        <td>this example shows how to use CDI in Karaf, with 
annotations (Inject, etc).</td>
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-cdi-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Shell Command</strong></td>
                         <td>creating a shell command.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-command-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-command-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Configuration</strong></td>
                         <td>this example shows how to use configuration in 
your application, introducing different approach.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-config-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-config-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Deployer</strong></td>
                         <td>creating a Karaf deployer service on the deploy 
folder.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-deployer-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-deployer-example";
 target="_blank">
+                            <img src="/images/github.png" width="24px">
+                        </a></td>
+                    </tr>
+                    <tr>
+                        <td><strong>Docker</strong></td>
+                        <td>this example shows how to easily create Docker 
image with Karaf and your applications. It shows two kinds of packages: static 
or dynamic.</td>
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-docker-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Dump</strong></td>
                         <td>creating a dump provider service.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-dump-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-dump-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>HTTP resource</strong></td>
                         <td>creating a very simple bundle that just register 
an empty resource service.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-http-resource-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-http-resource-example";
 target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Integration test</strong></td>
                         <td>creating integration tests in addition of unit 
tests for your bundles.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-itest-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-itest-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>JAAS</strong></td>
                         <td>using the Karaf Security service in different 
way.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-jaas-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-jaas-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>JDBC</strong></td>
                         <td>using simple JDBC implementation with Pax-JDBC and 
an Apache Derby embedded database.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-jdbc-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-jdbc-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>JMS</strong></td>
                         <td>using a JMS ConnectionFactory service in code that 
you can implement to interact with JMS.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-jms-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-jms-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>JPA</strong></td>
                         <td>using JPA with entity manager for the persistence 
implementation.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-jpa-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-jpa-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Pax Logging Appender</strong></td>
                         <td>registering a custom Pax Logging appender.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-log-appender-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-log-appender-example";
 target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Maven</strong></td>
                         <td>using the Karaf Maven plugin with goals like 
assembly, client, deploy, kar, run...</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-maven-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-maven-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>MBean</strong></td>
                         <td>registering a JMX MBean in the Apache Karaf 
MBeanServer</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-mbean-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-mbean-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Profile</strong></td>
                         <td>creating several profiles (in a registry) and use 
these profiles to create custom distributions.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-profile-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-profile-example"; 
target="_blank">
+                            <img src="/images/github.png" width="24px">
+                        </a></td>
+                    </tr>
+                    <tr>
+                        <td><strong>Redis</strong></td>
+                        <td>using a Redis server (pub/sub, or key/value store) 
within Karaf.</td>
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-redis-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>REST</strong></td>
                         <td>using JAX-RS to implement a REST service.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-rest-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-rest-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Scheduler</strong></td>
                         <td>creating a runnable service periodically executed 
by the Apache Karaf scheduler.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-scheduler-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-scheduler-example";
 target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Service Component Runtime</strong></td>
                         <td>using services with annotations with the OSGi 
compendium specification.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-scr-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-scr-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Servlet</strong></td>
                         <td>registering a servlet in the Karaf HTTP Service 
with different approaches.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-servlet-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-servlet-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>SOAP</strong></td>
                         <td>using JAX-WS to implement a SOAP service.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-soap-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-soap-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>URL Namespace Handler</strong></td>
                         <td>creating a new URL namespace handler and use it in 
all Apache Karaf parts.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-url-namespace-handler-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-url-namespace-handler-example";
 target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>War</strong></td>
                         <td>creating a regular war to be deployed in Apache 
Karaf.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-war-example"; 
target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-war-example"; 
target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>
                     <tr>
                         <td><strong>Websocket</strong></td>
                         <td>this example show how to register a websocket in 
the Karaf HTTP Service.</td>
-                        <td><a 
href="https://github.com/apache/karaf/tree/master/examples/karaf-websocket-example";
 target="_blank">
+                        <td><a 
href="https://github.com/apache/karaf/tree/main/examples/karaf-websocket-example";
 target="_blank">
                             <img src="/images/github.png" width="24px">
                         </a></td>
                     </tr>

Modified: karaf/site/production/feed.xml
URL: 
http://svn.apache.org/viewvc/karaf/site/production/feed.xml?rev=1887988&r1=1887987&r2=1887988&view=diff
==============================================================================
--- karaf/site/production/feed.xml (original)
+++ karaf/site/production/feed.xml Wed Mar 24 05:07:44 2021
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><feed 
xmlns="http://www.w3.org/2005/Atom"; ><generator uri="https://jekyllrb.com/"; 
version="4.0.1">Jekyll</generator><link 
href="https://karaf.apache.org/feed.xml"; rel="self" type="application/atom+xml" 
/><link href="https://karaf.apache.org/"; rel="alternate" type="text/html" 
/><updated>2021-03-22T17:01:29+01:00</updated><id>https://karaf.apache.org/feed.xml</id><title
 type="html">Apache Karaf - The modulith runtime</title><subtitle>Karaf 
provides modulith runtime for the enterprise, running on premise or on cloud. 
Focus on your business code and applications, Apache Karaf deals with the 
rest.</subtitle></feed>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><feed 
xmlns="http://www.w3.org/2005/Atom"; ><generator uri="https://jekyllrb.com/"; 
version="4.0.1">Jekyll</generator><link 
href="https://karaf.apache.org/feed.xml"; rel="self" type="application/atom+xml" 
/><link href="https://karaf.apache.org/"; rel="alternate" type="text/html" 
/><updated>2021-03-24T06:00:14+01:00</updated><id>https://karaf.apache.org/feed.xml</id><title
 type="html">Apache Karaf - The modulith runtime</title><subtitle>Karaf 
provides modulith runtime for the enterprise, running on premise or on cloud. 
Focus on your business code and applications, Apache Karaf deals with the 
rest.</subtitle></feed>
\ No newline at end of file

Modified: karaf/site/production/news.html
URL: 
http://svn.apache.org/viewvc/karaf/site/production/news.html?rev=1887988&r1=1887987&r2=1887988&view=diff
==============================================================================
--- karaf/site/production/news.html (original)
+++ karaf/site/production/news.html Wed Mar 24 05:07:44 2021
@@ -1024,7 +1024,7 @@
                 <ul>
                   <dt>Docker</dt><dd>The docker feature allow users to manage 
their docker containers from the Karaf shell console with new commands 
<code>docker:xxx</code>. For example, you can create a Docker container using 
the current running Karaf instance with the command <code>docker:provision 
my-karaf</code>. You can learn more on the <a 
href="https://karaf.apache.org/manual/latest/#_docker"; target="_blank">user 
guide</a></dd>
                   <dt>Examples</dt><dd>The Apache Karaf Examples provide 
different starting point showing how to implement concrete use cases leveraging 
Apache Karaf capabilities. There is a list of the examples on the <a 
href="https://karaf.apache.org/documentation"; target="_blank">documentation 
page</a></dd>
-                  <dt>Test support</dt><dd>A new <code>KarafTestSupport</code> 
class is available in order to help developers for writing the itests of their 
bundles, features and custom distribution. You can take a look on the <a 
href="https://github.com/apache/karaf/tree/master/itests/test/src/test/java/org/apache/karaf/itests/examples";
 target="_blank">itests module</a> of the project to see how it's easy to use 
!</dd>
+                  <dt>Test support</dt><dd>A new <code>KarafTestSupport</code> 
class is available in order to help developers for writing the itests of their 
bundles, features and custom distribution. You can take a look on the <a 
href="https://github.com/apache/karaf/tree/main/itests/test/src/test/java/org/apache/karaf/itests/examples";
 target="_blank">itests module</a> of the project to see how it's easy to use 
!</dd>
                   <dt>JDK compatibility</dt><dd>We have improved the 
compatibility with the versions 9 / 10 / 11 of the JDK.</dd>
                   <dt>Dependency upgrades</dt><dd>A bunch of librairies have 
been upgraded:</dd>
                 </ul>


Reply via email to