You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2021/01/31 11:20:40 UTC
[plc4x] 28/45: - Cleaned up after preparing the release-branch
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/plc4c
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit ac48cca32a6d980272c92a2553bf9cb2ae664148
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Jan 25 12:42:02 2021 +0100
- Cleaned up after preparing the release-branch
---
RELEASE_NOTES | 15 +-
plc4go/pom.xml | 12 +-
plc4j/examples/dummy-driver/pom.xml | 8 +-
plc4j/examples/hello-webservice/pom.xml | 2 +-
plc4j/examples/hello-world-plc4x/pom.xml | 2 +-
plc4j/examples/replay-test/pom.xml | 4 +-
plc4j/karaf-features/README.md | 42 -----
plc4j/karaf-features/camel/pom.xml | 67 -------
plc4j/karaf-features/eip/pom.xml | 72 -------
plc4j/karaf-features/karaf-itest/pom.xml | 207 ---------------------
.../java/org/apache/plc4x/karaf/FeatureIT.java | 100 ----------
.../test/resources/etc/org.ops4j.pax.logging.cfg | 71 -------
plc4j/karaf-features/pom.xml | 82 --------
plc4j/karaf-features/s7/pom.xml | 71 -------
plc4j/pom.xml | 1 -
plc4j/protocols/ads/pom.xml | 8 +-
plc4j/protocols/benchmarks/pom.xml | 4 +-
plc4j/protocols/delta-v/pom.xml | 2 +-
plc4j/protocols/pom.xml | 2 +-
19 files changed, 36 insertions(+), 736 deletions(-)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 4f27cd5..09e2be1 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,5 +1,18 @@
==============================================================
-(Unreleased) Apache PLC4X 0.8.0-SNAPSHOT
+(Unreleased) Apache PLC4X 0.9.0-SNAPSHOT
+==============================================================
+
+New Features
+------------
+
+Incompatible changes
+--------------------
+
+Bug Fixes
+---------
+
+==============================================================
+Apache PLC4X 0.8.0-SNAPSHOT
==============================================================
This is an ordinary PLC4X release, containing changes that
diff --git a/plc4go/pom.xml b/plc4go/pom.xml
index 4ebecca..76c9bd3 100644
--- a/plc4go/pom.xml
+++ b/plc4go/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>plc4go</artifactId>
@@ -199,7 +199,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-build-utils-language-go</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
@@ -207,28 +207,28 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-bacnetip</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-knxnetip</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-modbus</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-s7</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
diff --git a/plc4j/examples/dummy-driver/pom.xml b/plc4j/examples/dummy-driver/pom.xml
index 33dd124..8205ce0 100644
--- a/plc4j/examples/dummy-driver/pom.xml
+++ b/plc4j/examples/dummy-driver/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-dummy-driver</artifactId>
@@ -38,18 +38,18 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-spi</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-transport-tcp</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/plc4j/examples/hello-webservice/pom.xml b/plc4j/examples/hello-webservice/pom.xml
index 7d09aab..181853b 100644
--- a/plc4j/examples/hello-webservice/pom.xml
+++ b/plc4j/examples/hello-webservice/pom.xml
@@ -76,7 +76,7 @@
<!--dependency>
<groupId>org.apache.plc4x.sandbox</groupId>
<artifactId>test-java-amsads-driver</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency-->
</dependencies>
diff --git a/plc4j/examples/hello-world-plc4x/pom.xml b/plc4j/examples/hello-world-plc4x/pom.xml
index a3f7fd9..d2c3797 100644
--- a/plc4j/examples/hello-world-plc4x/pom.xml
+++ b/plc4j/examples/hello-world-plc4x/pom.xml
@@ -64,7 +64,7 @@
<!--dependency>
<groupId>org.apache.plc4x.sandbox</groupId>
<artifactId>test-java-amsads-driver</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency-->
</dependencies>
diff --git a/plc4j/examples/replay-test/pom.xml b/plc4j/examples/replay-test/pom.xml
index 1bae2c7..8c3de6e 100644
--- a/plc4j/examples/replay-test/pom.xml
+++ b/plc4j/examples/replay-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.plc4x.examples</groupId>
<artifactId>plc4j-examples</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-replay-test</artifactId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/plc4j/karaf-features/README.md b/plc4j/karaf-features/README.md
deleted file mode 100644
index 818a097..0000000
--- a/plc4j/karaf-features/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-
- 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.
-
--->
-# This module provides Karaf features for plc4x
-
-As all plc4x modules are valid OSGi bundles, this module provides Karaf features for easier
-deployment to Apache Karaf.
-
-## Structure
-
-The module `driver-s7-featre` contains a `feature.xml` which defines a feature to load
-the drivers bundles and all dependent bundles.
-The module `karaf-itest` contains an integration test to ensure that the features load correct in Karaf.
-
-## Testing
-
-In the Module `karaf-itest` are integration tests which verify the generated feature.
-But as they use the feature from the local maven repository the features have to be installed first.
-The Integration tests run in the verify phase, so you can e.g. use the comman
-```$mvn
-mvn clean install verify
-```
-in the `karaf-features` module. This will first install the `driver-s7-feature` feature in the
-maven repo and then run the Integration test.
-
-The integration tests loads the feature and checks if the feature and the most important bundle
-can be loaded.
\ No newline at end of file
diff --git a/plc4j/karaf-features/camel/pom.xml b/plc4j/karaf-features/camel/pom.xml
deleted file mode 100644
index 584b7f6..0000000
--- a/plc4j/karaf-features/camel/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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">
-
- <parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-plc4x</artifactId>
- <name>PLC4J: Karaf-Features: Camel</name>
- <packaging>pom</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-apache-camel</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <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>features-generate-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/eip/pom.xml b/plc4j/karaf-features/eip/pom.xml
deleted file mode 100644
index ca4d460..0000000
--- a/plc4j/karaf-features/eip/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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">
- <parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>driver-eip-feature</artifactId>
- <name>PLC4J: Karaf-Features: EIP</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-osgi</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-eip</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <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>features-generate-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
-</project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/karaf-itest/pom.xml b/plc4j/karaf-features/karaf-itest/pom.xml
deleted file mode 100644
index 18e8068..0000000
--- a/plc4j/karaf-features/karaf-itest/pom.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?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>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>karaf-itest</artifactId>
-
- <name>PLC4J: Karaf-Features: Integration-Tests</name>
-
- <properties>
- <pax.version>4.13.1</pax.version>
- </properties>
-
- <dependencies>
- <!-- Important, have a dependency on the feature maven module that its built first -->
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>driver-s7-feature</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- <!-- Provide the KarafTestSupport -->
- <dependency>
- <groupId>org.apache.karaf.itests</groupId>
- <artifactId>common</artifactId>
- <version>${karaf.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- Define the Apache Karaf version to download and use for the test -->
- <!-- We use a released version here to avoid SNAPSHOT resolution -->
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${karaf.version}</version>
- <scope>test</scope>
- <type>tar.gz</type>
- </dependency>
-
- <!-- Add the surefire logger api as failsafe doesn't provide this -->
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-logger-api</artifactId>
- <version>${surefire.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.26</version>
- <scope>test</scope>
- </dependency>
- <!-- Required to use shell commands in the tests -->
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.core</artifactId>
- <version>${karaf.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- Provide the PaxExam Karaf support -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-karaf</artifactId>
- <version>${pax.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- Provide the PaxExam JUnit extension -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${pax.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>3.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hamcrest</artifactId>
- <version>1.3_1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-api</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-lang</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-util-property</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.istack</groupId>
- <artifactId>istack-commons-runtime</artifactId>
- <version>3.0.10</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- <version>1.4.0</version>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- See https://issues.apache.org/jira/browse/KARAF-6457 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- <systemPropertyVariables>
- <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
- <spring31.version>3.1.4.RELEASE</spring31.version>
- <spring32.version>3.2.18.RELEASE_1</spring32.version>
- <spring40.version>4.0.9.RELEASE_1</spring40.version>
- <spring41.version>4.1.9.RELEASE_1</spring41.version>
- <spring42.version>4.2.9.RELEASE_1</spring42.version>
- <spring43.version>4.3.25.RELEASE_1</spring43.version>
- <spring50.version>5.0.15.RELEASE_1</spring50.version>
- <spring51.version>5.1.9.RELEASE_1</spring51.version>
- <spring.security31.version>3.1.4.RELEASE</spring.security31.version>
- <spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
- <spring.security51.version>5.1.5.RELEASE_1</spring.security51.version>
- <activemq.version>5.15.9</activemq.version>
- <plc4x.version>${project.version}</plc4x.version>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Karaf currently doesn't work with Java 12 and above -->
- <!-- See: https://issues.apache.org/jira/projects/KARAF/issues/KARAF-6203 -->
- <profiles>
- <profile>
- <id>java12andAbove</id>
- <!--activation>
- <jdk>(12,]</jdk>
- </activation-->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java b/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
deleted file mode 100644
index d02505a..0000000
--- a/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed 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.
- */
-package org.apache.plc4x.karaf;
-
-import org.apache.karaf.itests.KarafTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-import org.osgi.framework.Bundle;
-
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public class FeatureIT extends KarafTestSupport {
-
- @Configuration
- public Option[] config() {
- Option[] options = new Option[]{
- logLevel(LogLevelOption.LogLevel.DEBUG),
- KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "plc4x.version", System.getProperty("plc4x.version")),
- };
- return Stream.of(super.config(), options).flatMap(Stream::of).toArray(Option[]::new);
- }
-
- /**
- * Checks:
- * - the feature can be installed
- * - the Driver Bundle is there and active
- * - the Bundle contains the DS for PlcDriver
- * - the feature is installed
- */
- @Test
- public void installAndAssertFeature() throws Exception {
- // Assemble Maven URL
- final MavenArtifactUrlReference featureRepo = maven()
- .groupId("org.apache.plc4x")
- .artifactId("driver-s7-feature")
- .version(System.getProperty("plc4x.version"))
- .type("xml")
- .classifier("features");
- System.out.println("Installing feature repo " + featureRepo.getURL());
-
- // Install the feature-repo
- addFeaturesRepository(featureRepo.getURL());
-
- // Install the feature
- installAndAssertFeature("driver-s7-feature");
-
- // Print Bundles and fetch result
- String bundles = executeCommand("bundle:list -t 0");
-
- // Find that line
- // 84 │ Active │ 80 │ 0.6.0.SNAPSHOT │ PLC4J: Driver: S7
- assertContains("PLC4J: Driver: S7", bundles);
- System.out.println(bundles);
-
- // Find Bundle for more detailed check
- final Bundle bundle = findBundleByName("org.apache.plc4x.plc4j-driver-s7");
-
- // Bundle has to be ACTIVE
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
-
- // Check declarative service is present
- String services = executeCommand("services -p " + bundle.getBundleId());
- System.out.println("Services: " + services);
- assertContains("component.name = org.apache.plc4x.java.s7.S7PlcDriver", services);
- assertContains("objectClass = [org.apache.plc4x.java.spi.PlcDriver]", services);
-
- // Just for Debugging...
- String features = executeCommand("feature:list -i");
- System.out.print(features);
- assertContains("driver-s7-feature", features);
- }
-
-}
\ No newline at end of file
diff --git a/plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg b/plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index 285e55f..0000000
--- a/plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,71 +0,0 @@
-###############################################################################
-#
-# 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.
-#
-################################################################################
-
-# See https://issues.apache.org/jira/browse/KARAF-6456
-
-# Common pattern layout for appenders
-log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# Root logger
-log4j2.rootLogger.level = INFO
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#log4j2.rootLogger.type = asyncRoot
-#log4j2.rootLogger.includeLocation = false
-log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi, Console
-log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
-log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
-log4j2.rootLogger.appenderRef.Console.ref = Console
-log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
-
-# Appenders configuration
-log4j2.appenders = console, rolling, osgi
-
-# CONSOLE appender not used by default
-log4j2.appender.console.type = Console
-log4j2.appender.console.name = Console
-log4j2.appender.console.layout.type = PatternLayout
-log4j2.appender.console.layout.pattern = ${log4j2.pattern}
-
-# File appender
-log4j2.appender.rolling.type = RollingRandomAccessFile
-log4j2.appender.rolling.name = RollingFile
-log4j2.appender.rolling.fileName = ${karaf.log}/karaf.log
-log4j2.appender.rolling.filePattern = ${karaf.log}/karaf.log.%i
-# uncomment to not force a disk flush
-#log4j2.appender.rolling.immediateFlush = false
-log4j2.appender.rolling.append = true
-log4j2.appender.rolling.layout.type = PatternLayout
-log4j2.appender.rolling.layout.pattern = ${log4j2.pattern}
-log4j2.appender.rolling.policies.type = Policies
-log4j2.appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.rolling.policies.size.size = 16MB
-
-# OSGi appender
-log4j2.appender.osgi.type = PaxOsgi
-log4j2.appender.osgi.name = PaxOsgi
-log4j2.appender.osgi.filter = *
-
-# help with identification of maven-related problems with pax-url-aether
-#log4j2.logger.aether.name = shaded.org.eclipse.aether
-#log4j2.logger.aether.level = TRACE
-#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
-#log4j2.logger.http-headers.level = DEBUG
-#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
-#log4j2.logger.maven.level = TRACE
\ No newline at end of file
diff --git a/plc4j/karaf-features/pom.xml b/plc4j/karaf-features/pom.xml
deleted file mode 100644
index 2c0bc00..0000000
--- a/plc4j/karaf-features/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>karaf-features</artifactId>
- <packaging>pom</packaging>
-
- <name>PLC4J: Karaf-Features</name>
-
- <properties>
- <karaf.version>4.2.8</karaf.version>
- </properties>
-
- <modules>
- <module>s7</module>
- <module>eip</module>
- <module>camel</module>
- <!--module>karaf-itest</module-->
- </modules>
-
- <dependencies>
- <!-- Forcefully exclude slf4j -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.14</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>4.2.7</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-</project>
\ No newline at end of file
diff --git a/plc4j/karaf-features/s7/pom.xml b/plc4j/karaf-features/s7/pom.xml
deleted file mode 100644
index 9b15440..0000000
--- a/plc4j/karaf-features/s7/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-features</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>driver-s7-feature</artifactId>
- <packaging>pom</packaging>
-
- <name>PLC4J: Karaf-Features: S7</name>
-
- <!--Adding dependencies to generate the XML -->
- <dependencies>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-osgi</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-s7</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <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>features-generate-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index 9ac1e2f..3ab332c 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -38,7 +38,6 @@
<module>drivers</module>
<module>examples</module>
<module>integrations</module>
- <!--module>karaf-features</module-->
<module>spi</module>
<module>tools</module>
<module>transports</module>
diff --git a/plc4j/protocols/ads/pom.xml b/plc4j/protocols/ads/pom.xml
index 043db22..df53d10 100644
--- a/plc4j/protocols/ads/pom.xml
+++ b/plc4j/protocols/ads/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-protocols</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-protocol-ads</artifactId>
@@ -36,12 +36,12 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-spi</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -93,7 +93,7 @@
<!--dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-transport-test</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<scope>test</scope>
</dependency-->
<dependency>
diff --git a/plc4j/protocols/benchmarks/pom.xml b/plc4j/protocols/benchmarks/pom.xml
index 83e650d..349168f 100644
--- a/plc4j/protocols/benchmarks/pom.xml
+++ b/plc4j/protocols/benchmarks/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>plc4j-protocols</artifactId>
<groupId>org.apache.plc4x</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-protocol-benchmarks</artifactId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-protocol-ads</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/protocols/delta-v/pom.xml b/plc4j/protocols/delta-v/pom.xml
index 5d31e5d..810ac4d 100644
--- a/plc4j/protocols/delta-v/pom.xml
+++ b/plc4j/protocols/delta-v/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-protocols</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-protocol-delta-v</artifactId>
diff --git a/plc4j/protocols/pom.xml b/plc4j/protocols/pom.xml
index f6f19cc..606cdc4 100644
--- a/plc4j/protocols/pom.xml
+++ b/plc4j/protocols/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-protocols</artifactId>