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 2024/02/14 22:19:00 UTC
(plc4x) branch develop updated (0329142126 -> 2a3e5eab9a)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 0329142126 refactor: Cleaned up in the API (moved the PlcConfiguration-related interfaces back to SPI), renamed the "canX()" methods to match the bean naming convention of "isXSupported()". Also removed one or two obsolete interfaces)
new 15fc55ebec chore: Added the osgi bundle generation calls to the bacnet plugin (It was the only one missing this)
new 2a3e5eab9a feat: Added the code for signing all artifacts after the release-build was finished.
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:
plc4j/drivers/bacnet/pom.xml | 51 ++++++++++++++++++++++++++++++++++++++
tools/release-3-perform-release.sh | 7 ++++--
2 files changed, 56 insertions(+), 2 deletions(-)
(plc4x) 02/02: feat: Added the code for signing all artifacts after the release-build was finished.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 2a3e5eab9a7592eb21821bdf3faa9db2d441fb7b
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Wed Feb 14 23:18:53 2024 +0100
feat: Added the code for signing all artifacts after the release-build was finished.
---
tools/release-3-perform-release.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/release-3-perform-release.sh b/tools/release-3-perform-release.sh
index 447365bd4c..fa3e7b644a 100755
--- a/tools/release-3-perform-release.sh
+++ b/tools/release-3-perform-release.sh
@@ -29,8 +29,11 @@
# 1. Do a simple release-perform command skip signing of artifacts and deploy to local directory (inside the Docker container)
docker compose run --rm releaser bash /ws/mvnw -e -Dmaven.repo.local=/ws/out/.repository -DaltDeploymentRepository=snapshot-repo::default::file:/ws/out/.local-artifacts-dir release:perform
-# 2. Sign the artifacts
-# TODO: it seems the gpg sign plugin only signs one artifact ... gotta find out how to sign every jar in out/.local-artifacts-dir
+# 2. Sign all artifacts
+find ./out/.local-artifacts-dir -print | grep -E '^((.*\.pom)|(.*\.jar)|(.*\.kar)|(.*\.nar)|(.*-features\.xml)|(.*-cycloneds\.json)|(.*-cycloneds\.xml)|(.*-site\.xml)|(.*\.zip))$' | while read -r line ; do
+ echo "Processing $line"
+ gpg -ab "$line"
+done
# 3. Deploy the artifacts to Nexus
# TODO: Use the same technique we use on Jenkins to deploy everything in a local repo
(plc4x) 01/02: chore: Added the osgi bundle generation calls to the bacnet plugin (It was the only one missing this)
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 15fc55ebecc27c7182883a0af9ca05a758f08b21
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Wed Feb 14 23:18:23 2024 +0100
chore: Added the osgi bundle generation calls to the bacnet plugin (It was the only one missing this)
---
plc4j/drivers/bacnet/pom.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/plc4j/drivers/bacnet/pom.xml b/plc4j/drivers/bacnet/pom.xml
index be17e10c8b..d8181ce0db 100644
--- a/plc4j/drivers/bacnet/pom.xml
+++ b/plc4j/drivers/bacnet/pom.xml
@@ -34,6 +34,57 @@
<project.build.outputTimestamp>2023-11-02T07:23:09Z</project.build.outputTimestamp>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-feature-xml</id>
+ <phase>compile</phase>
+ <goals>
+ <!-- Generate the feature.xml -->
+ <goal>features-generate-descriptor</goal>
+ <!-- Check the feature.xml -->
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <enableGeneration>true</enableGeneration>
+ <aggregateFeatures>true</aggregateFeatures>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-kar</id>
+ <phase>package</phase>
+ <goals>
+ <!--
+ Build a kar archive (Jar containing the feature.xml
+ as well as the module content and it's dependencies.
+ -->
+ <goal>kar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
+ <Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.bacnetip.BacNetIpDriver</Export-Service>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.plc4x</groupId>