You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/11/24 23:33:26 UTC
[incubator-plc4x] branch develop updated (1c2a5e4 -> 5e7c6c0)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 1c2a5e4 [plc4j-scraper] Added complete example.
new eca6fc3 [plc4x-osgi] fixed complains about missing plugin version
new 5e7c6c0 [plc4x-karaf] added new karaf-integration
The 2 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.
Summary of changes:
.../apache-karaf/karaf-ads-feature}/pom.xml | 27 ++++-
.../apache-karaf/karaf-demo-server/pom.xml | 126 +++++++++++++++++++++
.../karaf-ethernet-ip-feature}/pom.xml | 27 ++++-
.../apache-karaf/karaf-modbus-feature}/pom.xml | 27 ++++-
.../apache-karaf/karaf-s7-feature}/pom.xml | 27 ++++-
.../apache-karaf/karaf-simulated-feature}/pom.xml | 27 ++++-
integrations/apache-karaf/pom.xml | 86 ++++++++++++++
integrations/pom.xml | 1 +
pom.xml | 6 +
9 files changed, 324 insertions(+), 30 deletions(-)
copy {plc4j/drivers/delta-v => integrations/apache-karaf/karaf-ads-feature}/pom.xml (56%)
create mode 100644 integrations/apache-karaf/karaf-demo-server/pom.xml
copy {plc4j/drivers/delta-v => integrations/apache-karaf/karaf-ethernet-ip-feature}/pom.xml (55%)
copy {plc4j/drivers/delta-v => integrations/apache-karaf/karaf-modbus-feature}/pom.xml (56%)
copy {plc4j/drivers/delta-v => integrations/apache-karaf/karaf-s7-feature}/pom.xml (56%)
copy {plc4j/drivers/delta-v => integrations/apache-karaf/karaf-simulated-feature}/pom.xml (55%)
create mode 100644 integrations/apache-karaf/pom.xml
[incubator-plc4x] 01/02: [plc4x-osgi] fixed complains about missing
plugin version
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit eca6fc32252fb8007bf7a5ba826418fc8b4f88ee
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sun Nov 25 00:17:23 2018 +0100
[plc4x-osgi] fixed complains about missing plugin version
---
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index b9dac77..15d34fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -753,6 +753,12 @@
</plugin>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>4.1.0</version>
+ </plugin>
+
+ <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
[incubator-plc4x] 02/02: [plc4x-karaf] added new karaf-integration
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 5e7c6c03509caf70912f3a11f940e3f4537a3fec
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sun Nov 25 00:17:50 2018 +0100
[plc4x-karaf] added new karaf-integration
---
.../apache-karaf/karaf-ads-feature/pom.xml | 52 +++++++++
.../apache-karaf/karaf-demo-server/pom.xml | 126 +++++++++++++++++++++
.../apache-karaf/karaf-ethernet-ip-feature/pom.xml | 52 +++++++++
.../apache-karaf/karaf-modbus-feature/pom.xml | 52 +++++++++
integrations/apache-karaf/karaf-s7-feature/pom.xml | 52 +++++++++
.../apache-karaf/karaf-simulated-feature/pom.xml | 52 +++++++++
integrations/apache-karaf/pom.xml | 86 ++++++++++++++
integrations/pom.xml | 1 +
8 files changed, 473 insertions(+)
diff --git a/integrations/apache-karaf/karaf-ads-feature/pom.xml b/integrations/apache-karaf/karaf-ads-feature/pom.xml
new file mode 100644
index 0000000..b9b0575
--- /dev/null
+++ b/integrations/apache-karaf/karaf-ads-feature/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+
+<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>
+
+ <parent>
+ <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>karaf-ads-feature</artifactId>
+ <packaging>feature</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-driver-ads</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/integrations/apache-karaf/karaf-demo-server/pom.xml b/integrations/apache-karaf/karaf-demo-server/pom.xml
new file mode 100644
index 0000000..08fbc6d
--- /dev/null
+++ b/integrations/apache-karaf/karaf-demo-server/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+
+<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>
+
+ <parent>
+ <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>karaf-demo-server</artifactId>
+ <packaging>karaf-assembly</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <type>kar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>standard</artifactId>
+ <version>${karaf.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>karaf-ads-feature</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>karaf-ethernet-ip-feature</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>karaf-modbus-feature</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>karaf-s7-feature</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>karaf-simulated-feature</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ <bootFeatures>
+ <feature>framework</feature>
+ <feature>shell</feature>
+ <feature>shell-compat</feature>
+ <feature>feature</feature>
+ <feature>jaas</feature>
+ <feature>ssh</feature>
+ <feature>management</feature>
+ <feature>bundle</feature>
+ <feature>config</feature>
+ <feature>deployer</feature>
+ <feature>diagnostic</feature>
+ <feature>feature</feature>
+ <feature>instance</feature>
+ <feature>kar</feature>
+ <feature>log</feature>
+ <feature>wrap</feature>
+ <feature>package</feature>
+ <feature>service</feature>
+ <feature>system</feature>
+ </bootFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/integrations/apache-karaf/karaf-ethernet-ip-feature/pom.xml b/integrations/apache-karaf/karaf-ethernet-ip-feature/pom.xml
new file mode 100644
index 0000000..4e25767
--- /dev/null
+++ b/integrations/apache-karaf/karaf-ethernet-ip-feature/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+
+<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>
+
+ <parent>
+ <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>karaf-ethernet-ip-feature</artifactId>
+ <packaging>feature</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-driver-ethernet-ip</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/integrations/apache-karaf/karaf-modbus-feature/pom.xml b/integrations/apache-karaf/karaf-modbus-feature/pom.xml
new file mode 100644
index 0000000..998d19f
--- /dev/null
+++ b/integrations/apache-karaf/karaf-modbus-feature/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+
+<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>
+
+ <parent>
+ <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>karaf-modbus-feature</artifactId>
+ <packaging>feature</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-driver-modbus</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/integrations/apache-karaf/karaf-s7-feature/pom.xml b/integrations/apache-karaf/karaf-s7-feature/pom.xml
new file mode 100644
index 0000000..f6e5b62
--- /dev/null
+++ b/integrations/apache-karaf/karaf-s7-feature/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+
+<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>
+
+ <parent>
+ <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>karaf-s7-feature</artifactId>
+ <packaging>feature</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-driver-s7</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/integrations/apache-karaf/karaf-simulated-feature/pom.xml b/integrations/apache-karaf/karaf-simulated-feature/pom.xml
new file mode 100644
index 0000000..09a0b32
--- /dev/null
+++ b/integrations/apache-karaf/karaf-simulated-feature/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+
+<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>
+
+ <parent>
+ <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>karaf-simulated-feature</artifactId>
+ <packaging>feature</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-driver-simulated</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/integrations/apache-karaf/pom.xml b/integrations/apache-karaf/pom.xml
new file mode 100644
index 0000000..3752727
--- /dev/null
+++ b/integrations/apache-karaf/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+
+<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>
+
+ <parent>
+ <artifactId>integrations</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>apache-karaf</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <karaf.version>4.2.1</karaf.version>
+ <karaf-maven-plugin.version>${karaf.version}</karaf-maven-plugin.version>
+ </properties>
+
+ <modules>
+ <module>karaf-ads-feature</module>
+ <module>karaf-ethernet-ip-feature</module>
+ <module>karaf-modbus-feature</module>
+ <module>karaf-s7-feature</module>
+ <module>karaf-simulated-feature</module>
+ <!-- TODO: karaf-demo doesn't compile right now as slf4-api bundle dependency can't be resolved -->
+ <!--module>karaf-demo-server</module-->
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.buschmais.jqassistant</groupId>
+ <artifactId>jqassistant-maven-plugin</artifactId>
+ <version>1.5.0</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf-maven-plugin.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <enableGeneration>true</enableGeneration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-features-file</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/integrations/pom.xml b/integrations/pom.xml
index 3e681e9..5689d71 100644
--- a/integrations/pom.xml
+++ b/integrations/pom.xml
@@ -39,6 +39,7 @@
<module>apache-kafka</module>
<module>apache-mynewt</module>
<module>apache-nifi</module>
+ <module>apache-karaf</module>
</modules>
</project>
\ No newline at end of file