[GitHub] servicemix-bundles pull request #126: SM-3714 Create OSGi bundle for Thymele...

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[GitHub] servicemix-bundles pull request #126: SM-3714 Create OSGi bundle for Thymele...

oliverlietz
GitHub user oliverlietz opened a pull request:

    https://github.com/apache/servicemix-bundles/pull/126

    SM-3714 Create OSGi bundle for Thymeleaf 3.0.9

   

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/oliverlietz/servicemix-bundles SM-3714

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/servicemix-bundles/pull/126.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #126
   
----
commit d1c6361511ed9bb2791d294556f505fdfa2a92ec
Author: Oliver Lietz <olli@...>
Date:   2018-05-19T09:57:57Z

    SM-3714 Create OSGi bundle for Thymeleaf 3.0.9

----


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] servicemix-bundles pull request #126: SM-3714 Create OSGi bundle for Thymele...

oliverlietz
Github user jbonofre commented on a diff in the pull request:

    https://github.com/apache/servicemix-bundles/pull/126#discussion_r189633363
 
    --- Diff: thymeleaf-3.0.9.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.9.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.9.RELEASE</pkgVersion>
    +    <servicemix.osgi.export>${servicemix.osgi.export.pkg}</servicemix.osgi.export>
    +    <servicemix.osgi.export.pkg>
    --- End diff --
   
    Only `servicemix.osgi.export.pkg` property is required. Please remove `servicemix.osgi.export`.


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] servicemix-bundles pull request #126: SM-3714 Create OSGi bundle for Thymele...

oliverlietz
In reply to this post by oliverlietz
Github user jbonofre commented on a diff in the pull request:

    https://github.com/apache/servicemix-bundles/pull/126#discussion_r189632012
 
    --- Diff: thymeleaf-3.0.9.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.9.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>
    --- End diff --
   
    No need.


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] servicemix-bundles pull request #126: SM-3714 Create OSGi bundle for Thymele...

oliverlietz
In reply to this post by oliverlietz
Github user oliverlietz commented on a diff in the pull request:

    https://github.com/apache/servicemix-bundles/pull/126#discussion_r189641149
 
    --- Diff: thymeleaf-3.0.9.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.9.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.9.RELEASE</pkgVersion>
    +    <servicemix.osgi.export>${servicemix.osgi.export.pkg}</servicemix.osgi.export>
    +    <servicemix.osgi.export.pkg>
    --- End diff --
   
    `servicemix.osgi.export` is required for proper versioned packages, otherwise `pkgVersion` is appended after last package (see pattern defined by `servicemix.osgi.export` in parent POM).


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] servicemix-bundles pull request #126: SM-3714 Create OSGi bundle for Thymele...

oliverlietz
In reply to this post by oliverlietz
Github user oliverlietz closed the pull request at:

    https://github.com/apache/servicemix-bundles/pull/126


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] servicemix-bundles pull request #126: SM-3714 Create OSGi bundle for Thymele...

oliverlietz
In reply to this post by oliverlietz
Github user jbonofre commented on a diff in the pull request:

    https://github.com/apache/servicemix-bundles/pull/126#discussion_r189645091
 
    --- Diff: thymeleaf-3.0.9.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.9.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.9.RELEASE</pkgVersion>
    +    <servicemix.osgi.export>${servicemix.osgi.export.pkg}</servicemix.osgi.export>
    +    <servicemix.osgi.export.pkg>
    --- End diff --
   
    In that case, don't provide the pkg property. See other bundle for example.


---