You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by er...@apache.org on 2020/04/03 14:43:11 UTC
[plc4x] branch osgi created (now dfe424f)
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a change to branch osgi
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
at dfe424f Merge branch 'develop' of https://github.com/apache/plc4x into osgi
This branch includes the following new commits:
new 38f5ce8 Generating feature.xml with dependencies using maven plugin
new 852c16e Generated features for EIP, S7 and Camel
new dfe424f Merge branch 'develop' of https://github.com/apache/plc4x into osgi
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[plc4x] 02/03: Generated features for EIP, S7 and Camel
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a commit to branch osgi
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 852c16e592ababf1d231c7004d9cfb1a73cce6d3
Author: Etienne Robinet <et...@gmail.com>
AuthorDate: Thu Apr 2 13:52:34 2020 +0200
Generated features for EIP, S7 and Camel
---
plc4j/karaf-features/{s7 => camel}/pom.xml | 16 ++++++++--------
plc4j/karaf-features/{s7 => eip}/pom.xml | 17 ++++++++---------
plc4j/karaf-features/pom.xml | 15 +++------------
plc4j/karaf-features/s7/pom.xml | 1 -
4 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/plc4j/karaf-features/s7/pom.xml b/plc4j/karaf-features/camel/pom.xml
similarity index 82%
copy from plc4j/karaf-features/s7/pom.xml
copy to plc4j/karaf-features/camel/pom.xml
index d267243..bbedb00 100644
--- a/plc4j/karaf-features/s7/pom.xml
+++ b/plc4j/karaf-features/camel/pom.xml
@@ -17,8 +17,9 @@
limitations under the License.
-->
-<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">
- <modelVersion>4.0.0</modelVersion>
+<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">
<parent>
<groupId>org.apache.plc4x</groupId>
@@ -26,16 +27,16 @@
<version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>driver-s7-feature</artifactId>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
- <name>PLC4J: Karaf-Features: S7</name>
+ <artifactId>camel-feature</artifactId>
+ <name>PLC4J: Karaf-Features: Camel</name>
+ <packaging>pom</packaging>
- <!--Adding dependencies to generate the XML -->
<dependencies>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-s7</artifactId>
+ <artifactId>plc4j-apache-camel</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -61,7 +62,6 @@
</executions>
</plugin>
</plugins>
-
</build>
</project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/s7/pom.xml b/plc4j/karaf-features/eip/pom.xml
similarity index 82%
copy from plc4j/karaf-features/s7/pom.xml
copy to plc4j/karaf-features/eip/pom.xml
index d267243..03821af 100644
--- a/plc4j/karaf-features/s7/pom.xml
+++ b/plc4j/karaf-features/eip/pom.xml
@@ -17,25 +17,24 @@
limitations under the License.
-->
-<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">
- <modelVersion>4.0.0</modelVersion>
-
+<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">
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>karaf-features</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>driver-s7-feature</artifactId>
+ <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <name>PLC4J: Karaf-Features: S7</name>
-
- <!--Adding dependencies to generate the XML -->
+ <artifactId>driver-eip-feature</artifactId>
+ <name>PLC4J: Karaf-Features: EIP</name>
<dependencies>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-s7</artifactId>
+ <artifactId>plc4j-driver-eip</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -61,7 +60,7 @@
</executions>
</plugin>
</plugins>
-
</build>
+
</project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/pom.xml b/plc4j/karaf-features/pom.xml
index 45b6e5d..6a76497 100644
--- a/plc4j/karaf-features/pom.xml
+++ b/plc4j/karaf-features/pom.xml
@@ -37,7 +37,9 @@
<modules>
<module>s7</module>
- <module>karaf-itest</module>
+ <module>eip</module>
+ <module>camel</module>
+ <!--module>karaf-itest</module-->
</modules>
<dependencies>
@@ -75,17 +77,6 @@
</plugin>
</plugins>
</pluginManagement>
-
- <plugins>
- <!-- No checking needed here -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/s7/pom.xml b/plc4j/karaf-features/s7/pom.xml
index d267243..2c023c5 100644
--- a/plc4j/karaf-features/s7/pom.xml
+++ b/plc4j/karaf-features/s7/pom.xml
@@ -61,7 +61,6 @@
</executions>
</plugin>
</plugins>
-
</build>
</project>
\ No newline at end of file
[plc4x] 03/03: Merge branch 'develop' of
https://github.com/apache/plc4x into osgi
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a commit to branch osgi
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit dfe424f60cf27a43badc41620b0a3abcd3942f8e
Merge: 852c16e 825701d
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Thu Apr 2 14:05:02 2020 +0200
Merge branch 'develop' of https://github.com/apache/plc4x into osgi
plc4j/integrations/apache-camel/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
[plc4x] 01/03: Generating feature.xml with dependencies using maven
plugin
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a commit to branch osgi
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 38f5ce8f4df1a4a2e5a1dcf12c0553ad5a448635
Merge: c4f6ffe 387a17d
Author: Etienne Robinet <et...@gmail.com>
AuthorDate: Thu Apr 2 10:43:52 2020 +0200
Generating feature.xml with dependencies using maven plugin
plc4j/karaf-features/s7/pom.xml | 73 ++++++----------------
.../karaf-features/s7/src/main/feature/feature.xml | 44 -------------
protocols/pom.xml | 5 ++
src/site/asciidoc/developers/maturity.adoc | 4 +-
.../asciidoc/users/blogs-videos-and-slides.adoc | 4 +-
5 files changed, 29 insertions(+), 101 deletions(-)
diff --cc plc4j/karaf-features/s7/pom.xml
index 0c861ef,0c861ef..d267243
--- a/plc4j/karaf-features/s7/pom.xml
+++ b/plc4j/karaf-features/s7/pom.xml
@@@ -31,72 -31,72 +31,37 @@@
<name>PLC4J: Karaf-Features: S7</name>
-- <!-- This would be necessary with the kar goal which works not fine, yet -->
-- <!-- <dependencies>-->
-- <!-- <dependency>-->
-- <!-- <groupId>org.apache.plc4x</groupId>-->
-- <!-- <artifactId>plc4j-driver-s7</artifactId>-->
-- <!-- <version>${project.version}</version>-->
-- <!-- <exclusions>-->
-- <!-- <exclusion>-->
-- <!-- <groupId>org.slf4j</groupId>-->
-- <!-- <artifactId>slf4j-api</artifactId>-->
-- <!-- </exclusion>-->
-- <!-- </exclusions>-->
-- <!-- </dependency>-->
-- <!-- </dependencies>-->
++ <!--Adding dependencies to generate the XML -->
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.plc4x</groupId>
++ <artifactId>plc4j-driver-s7</artifactId>
++ <version>${project.version}</version>
++ </dependency>
++ </dependencies>
<build>
-- <resources>
-- <resource>
-- <directory>src/main/feature</directory>
-- <filtering>true</filtering>
-- <targetPath>${project.build.directory}/feature</targetPath>
-- </resource>
-- </resources>
--
<plugins>
<plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-resources-plugin</artifactId>
++ <groupId>org.apache.karaf.tooling</groupId>
++ <artifactId>karaf-maven-plugin</artifactId>
++ <extensions>true</extensions>
++ <configuration>
++ <enableGeneration>true</enableGeneration>
++ <aggregateFeatures>true</aggregateFeatures>
++ </configuration>
<executions>
<execution>
++ <id>generate-features-file</id>
++ <phase>generate-resources</phase>
<goals>
-- <goal>resources</goal>
++ <goal>features-generate-descriptor</goal>
</goals>
</execution>
</executions>
</plugin>
--
-- <!--
-- The feature plugin doesn't correctly attach the generated feature file so it
-- wouldn't be signed and hashed during a release build. By manually-attaching it
-- we make sure it's processed correctly.
-- -->
-- <plugin>
-- <groupId>org.codehaus.mojo</groupId>
-- <artifactId>build-helper-maven-plugin</artifactId>
-- <version>3.0.0</version>
-- <executions>
-- <execution>
-- <id>attach-features</id>
-- <phase>package</phase>
-- <goals>
-- <goal>attach-artifact</goal>
-- </goals>
-- <configuration>
-- <artifacts>
-- <artifact>
-- <file>target/feature/feature.xml</file>
-- <classifier>features</classifier>
-- <type>xml</type>
-- </artifact>
-- </artifacts>
-- </configuration>
-- </execution>
-- </executions>
-- </plugin>
</plugins>
++
</build>
</project>
diff --cc plc4j/karaf-features/s7/src/main/feature/feature.xml
index b4c7b0b,b4c7b0b..0000000
deleted file mode 100644,100644
--- a/plc4j/karaf-features/s7/src/main/feature/feature.xml
+++ /dev/null
@@@ -1,44 -1,44 +1,0 @@@
--<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
--<!--
--
-- 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.
--
---->
--<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="driver-s7-feature">
-- <feature name="driver-s7-feature" description="driver-s7-feature" version="0.6.0.SNAPSHOT">
-- <details>PLC4X is an effort to create a universal library for accessing industrial programmable logic controllers
-- using a variety of protocols using a uniform API.
-- </details>
-- <feature prerequisite="true">wrap</feature>
-- <feature>scr</feature>
-- <bundle>mvn:org.apache.plc4x/plc4j-driver-s7/${project.version}</bundle>
-- <bundle>mvn:org.apache.plc4x/plc4j-api/${project.version}</bundle>
-- <bundle>mvn:org.apache.plc4x/plc4j-spi/${project.version}</bundle>
-- <bundle>mvn:org.apache.plc4x/plc4j-transport-tcp/${project.version}</bundle>
-- <bundle>mvn:io.netty/netty-codec/4.1.39.Final</bundle>
-- <bundle>mvn:com.github.jinahya/bit-io/1.4.3</bundle>
-- <bundle>mvn:commons-codec/commons-codec/1.12</bundle>
-- <bundle>mvn:io.netty/netty-common/4.1.39.Final</bundle>
-- <bundle>mvn:io.netty/netty-transport/4.1.39.Final</bundle>
-- <bundle>mvn:io.netty/netty-resolver/4.1.39.Final</bundle>
-- <bundle>mvn:io.netty/netty-buffer/4.1.39.Final</bundle>
-- <bundle>mvn:org.apache.commons/commons-configuration2/2.6</bundle>
-- <bundle>mvn:org.apache.commons/commons-text/1.8</bundle>
-- <bundle>mvn:commons-logging/commons-logging/1.2</bundle>
-- <bundle>mvn:org.apache.commons/commons-lang3/3.7</bundle>
-- <bundle>mvn:commons-io/commons-io/2.6</bundle>
-- </feature>
--</features>