You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2018/05/21 15:16:18 UTC
[1/2] servicemix-bundles git commit: [SM-3705] Added Thymeleaf 3.0.0
to kit [Forced Update!]
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 44035b298 -> 46c6ca3d3 (forced update)
[SM-3705] Added Thymeleaf 3.0.0 to kit
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/46c6ca3d
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/46c6ca3d
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/46c6ca3d
Branch: refs/heads/master
Commit: 46c6ca3d32744c3bf946af52cf2c71ad0e922980
Parents: 3ef3829
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon May 21 17:09:27 2018 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon May 21 17:15:58 2018 +0200
----------------------------------------------------------------------
pom.xml | 1 +
thymeleaf-3.0.0.RELEASE/pom.xml | 76 ++++++++++++++++++------------------
2 files changed, 39 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/46c6ca3d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c7ceee0..1611a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
<module>grpc-1.12.0</module>
<module>saxon-9.8.0-12</module>
<module>orbitz-consul-client-1.2.0</module>
+ <module>thymeleaf-3.0.0.RELEASE</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/46c6ca3d/thymeleaf-3.0.0.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/thymeleaf-3.0.0.RELEASE/pom.xml b/thymeleaf-3.0.0.RELEASE/pom.xml
index 2f5e20c..f601223 100644
--- a/thymeleaf-3.0.0.RELEASE/pom.xml
+++ b/thymeleaf-3.0.0.RELEASE/pom.xml
@@ -48,44 +48,44 @@
<pkgVersion>3.0.0.RELEASE</pkgVersion>
<servicemix.osgi.export>${servicemix.osgi.export.pkg}</servicemix.osgi.export>
<servicemix.osgi.export.pkg>
- org.thymeleaf;version="3.0.0",
- org.thymeleaf.cache;version="3.0.0",
- org.thymeleaf.context;version="3.0.0",
- org.thymeleaf.dialect;version="3.0.0",
- org.thymeleaf.engine;version="3.0.0",
- org.thymeleaf.exceptions;version="3.0.0",
- org.thymeleaf.expression;version="3.0.0",
- org.thymeleaf.inline;version="3.0.0",
- org.thymeleaf.linkbuilder;version="3.0.0",
- org.thymeleaf.messageresolver;version="3.0.0",
- org.thymeleaf.model;version="3.0.0",
- org.thymeleaf.postprocessor;version="3.0.0",
- org.thymeleaf.preprocessor;version="3.0.0",
- org.thymeleaf.processor;version="3.0.0",
- org.thymeleaf.processor.cdatasection;version="3.0.0",
- org.thymeleaf.processor.comment;version="3.0.0",
- org.thymeleaf.processor.doctype;version="3.0.0",
- org.thymeleaf.processor.element;version="3.0.0",
- org.thymeleaf.processor.processinginstruction;version="3.0.0",
- org.thymeleaf.processor.templateboundaries;version="3.0.0",
- org.thymeleaf.processor.text;version="3.0.0",
- org.thymeleaf.processor.xmldeclaration;version="3.0.0",
- org.thymeleaf.standard;version="3.0.0",
- org.thymeleaf.standard.expression;version="3.0.0",
- org.thymeleaf.standard.inline;version="3.0.0",
- org.thymeleaf.standard.processor;version="3.0.0",
- org.thymeleaf.standard.serializer;version="3.0.0",
- org.thymeleaf.standard.util;version="3.0.0",
- org.thymeleaf.templatemode;version="3.0.0",
- org.thymeleaf.templateparser;version="3.0.0",
- org.thymeleaf.templateparser.markup;version="3.0.0",
- org.thymeleaf.templateparser.markup.decoupled;version="3.0.0",
- org.thymeleaf.templateparser.raw;version="3.0.0",
- org.thymeleaf.templateparser.reader;version="3.0.0",
- org.thymeleaf.templateparser.text;version="3.0.0",
- org.thymeleaf.templateresolver;version="3.0.0",
- org.thymeleaf.templateresource;version="3.0.0",
- org.thymeleaf.util;version="3.0.0"
+ org.thymeleaf;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.cache;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.context;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.dialect;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.engine;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.exceptions;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.expression;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.inline;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.linkbuilder;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.messageresolver;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.model;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.postprocessor;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.preprocessor;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor.cdatasection;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor.comment;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor.doctype;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor.element;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor.processinginstruction;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor.templateboundaries;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor.text;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.processor.xmldeclaration;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.standard;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.standard.expression;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.standard.inline;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.standard.processor;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.standard.serializer;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.standard.util;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templatemode;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templateparser;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templateparser.markup;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templateparser.markup.decoupled;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templateparser.raw;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templateparser.reader;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templateparser.text;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templateresolver;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.templateresource;version="3.0.0";-split-package:=merge-first,
+ org.thymeleaf.util;version="3.0.0";-split-package:=merge-first,
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
javax.servlet.*;resolution:=optional,
[2/2] servicemix-bundles git commit: SM-3705 Create OSGi bundle for
Thymeleaf 3.0.0
Posted by ac...@apache.org.
SM-3705 Create OSGi bundle for Thymeleaf 3.0.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/3ef38292
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/3ef38292
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/3ef38292
Branch: refs/heads/master
Commit: 3ef3829210d30e4dddb44788c332b13f5214b42c
Parents: 0b29529
Author: Oliver Lietz <ol...@apache.org>
Authored: Sat May 19 11:52:03 2018 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon May 21 17:15:58 2018 +0200
----------------------------------------------------------------------
thymeleaf-3.0.0.RELEASE/pom.xml | 148 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 15 ++
2 files changed, 163 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/3ef38292/thymeleaf-3.0.0.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/thymeleaf-3.0.0.RELEASE/pom.xml b/thymeleaf-3.0.0.RELEASE/pom.xml
new file mode 100644
index 0000000..2f5e20c
--- /dev/null
+++ b/thymeleaf-3.0.0.RELEASE/pom.xml
@@ -0,0 +1,148 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>13</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.servicemix.bundles.thymeleaf</artifactId>
+ <version>3.0.0.RELEASE_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>This OSGi bundles wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <properties>
+ <pkgGroupId>org.thymeleaf</pkgGroupId>
+ <pkgArtifactId>thymeleaf</pkgArtifactId>
+ <pkgVersion>3.0.0.RELEASE</pkgVersion>
+ <servicemix.osgi.export>${servicemix.osgi.export.pkg}</servicemix.osgi.export>
+ <servicemix.osgi.export.pkg>
+ org.thymeleaf;version="3.0.0",
+ org.thymeleaf.cache;version="3.0.0",
+ org.thymeleaf.context;version="3.0.0",
+ org.thymeleaf.dialect;version="3.0.0",
+ org.thymeleaf.engine;version="3.0.0",
+ org.thymeleaf.exceptions;version="3.0.0",
+ org.thymeleaf.expression;version="3.0.0",
+ org.thymeleaf.inline;version="3.0.0",
+ org.thymeleaf.linkbuilder;version="3.0.0",
+ org.thymeleaf.messageresolver;version="3.0.0",
+ org.thymeleaf.model;version="3.0.0",
+ org.thymeleaf.postprocessor;version="3.0.0",
+ org.thymeleaf.preprocessor;version="3.0.0",
+ org.thymeleaf.processor;version="3.0.0",
+ org.thymeleaf.processor.cdatasection;version="3.0.0",
+ org.thymeleaf.processor.comment;version="3.0.0",
+ org.thymeleaf.processor.doctype;version="3.0.0",
+ org.thymeleaf.processor.element;version="3.0.0",
+ org.thymeleaf.processor.processinginstruction;version="3.0.0",
+ org.thymeleaf.processor.templateboundaries;version="3.0.0",
+ org.thymeleaf.processor.text;version="3.0.0",
+ org.thymeleaf.processor.xmldeclaration;version="3.0.0",
+ org.thymeleaf.standard;version="3.0.0",
+ org.thymeleaf.standard.expression;version="3.0.0",
+ org.thymeleaf.standard.inline;version="3.0.0",
+ org.thymeleaf.standard.processor;version="3.0.0",
+ org.thymeleaf.standard.serializer;version="3.0.0",
+ org.thymeleaf.standard.util;version="3.0.0",
+ org.thymeleaf.templatemode;version="3.0.0",
+ org.thymeleaf.templateparser;version="3.0.0",
+ org.thymeleaf.templateparser.markup;version="3.0.0",
+ org.thymeleaf.templateparser.markup.decoupled;version="3.0.0",
+ org.thymeleaf.templateparser.raw;version="3.0.0",
+ org.thymeleaf.templateparser.reader;version="3.0.0",
+ org.thymeleaf.templateparser.text;version="3.0.0",
+ org.thymeleaf.templateresolver;version="3.0.0",
+ org.thymeleaf.templateresource;version="3.0.0",
+ org.thymeleaf.util;version="3.0.0"
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ javax.servlet.*;resolution:=optional,
+ com.fasterxml.jackson.*;resolution:=optional,
+ *
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>false</optional>
+ </dependency>
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>false</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/3ef38292/thymeleaf-3.0.0.RELEASE/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/thymeleaf-3.0.0.RELEASE/src/main/resources/OSGI-INF/bundle.info b/thymeleaf-3.0.0.RELEASE/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..cc9a32f
--- /dev/null
+++ b/thymeleaf-3.0.0.RELEASE/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,15 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ Thymeleaf is a modern server-side Java template engine for both web and standalone environments.
+
+ Thymeleaf's main goal is to bring elegant natural templates to your development workflow — HTML that can be correctly displayed in browsers and also work as static prototypes, allowing for stronger collaboration in development teams.
+
+ With modules for Spring Framework, a host of integrations with your favourite tools, and the ability to plug in your own functionality, Thymeleaf is ideal for modern-day HTML5 JVM web development — although there is much more it can do.
+
+ \u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttps://www.thymeleaf.org\u001B[0m