Merge pull request #1 from ConnectorIO/feature/mavenized-artifacts

Testing workflow execution
ConnectorIO · Apr 8, 2024 · 6f90be3 · 6f90be3
2 parents a72a374 + e1fedaa
commit 6f90be3
Show file tree

Hide file tree

Showing 193 changed files with 224 additions and 566 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,6 +19,9 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
           cache: gradle
+          server-id: 'https://oss.sonatype.org'
+          server-username: CI_DEPLOY_USERNAME
+          server-password: CI_DEPLOY_PASSWORD
 
       - uses: kiancross/checkstyle-annotations-action@v1
 
@@ -34,7 +37,6 @@ jobs:
       - name: Validate EdgeApp.bndrun
         run: git diff --exit-code io.openems.edge.application/EdgeApp.bndrun
 
-      #
       # Generate Code-coverage-report
       #
       - name: Generate JaCoCo Code-coverage-report
@@ -65,6 +67,14 @@ jobs:
           mkdir -p ./jacoco
           echo $PR_NUMBER > ./jacoco/jacoco_report_number
           echo '![Code Coverage]'"(https://img.shields.io/badge/Code%20Coverage-${coverage}%25-${color}?style=flat)" > ./jacoco/jacoco_report_badge
+
+      - name: Deploy Edge+Backend assets
+        if: success() && github.event_name == 'push' && github.ref_name == 'develop'
+        run: ./gradlew buildEdge buildBackend release -DmavenPublishRepository=RemoteMavenRepository
+        env:
+          CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+          CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+
       - uses: actions/upload-artifact@v4
         with:
           name: jacoco_report

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,6 +17,10 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
           cache: gradle
+          server-id: 'https://oss.sonatype.org'
+          server-username: CI_RELEASE_USERNAME
+          server-password: CI_RELEASE_PASSWORD
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
 
       - uses: kiancross/checkstyle-annotations-action@v1
 
@@ -32,8 +36,12 @@ jobs:
       - name: Validate EdgeApp.bndrun
         run: git diff --exit-code io.openems.edge.application/EdgeApp.bndrun
 
-      - name: Prepare Edge+Backend assets
-        run: ./gradlew buildEdge buildBackend
+      - name: Prepare and deploy Edge+Backend assets
+        run: ./gradlew buildEdge buildBackend release -DmavenPublishRepository=RemoteMavenRepository -Drelease=true
+        env:
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          CI_RELEASE_USERNAME: ${{ secrets.CI_RELEASE_USERNAME }}
+          CI_RELEASE_PASSWORD: ${{ secrets.CI_RELEASE_PASSWORD }}
 
       - name: Save build-artifacts
         uses: actions/upload-artifact@v4

diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -18,10 +18,22 @@
 		pretty = true; \
 		local = ${build}/release
 
--releaserepo: Release
 -baselinerepo: Release
 
--pom: true
+Bundle-Vendor: FENECON GmbH
+Bundle-License: https://opensource.org/licenses/EPL-2.0
+Bundle-Version: 1.0.0.SNAPSHOT
+
+-include: ${if;${def;release};\
+  ${.}/release.bnd;\
+  ${.}/snapshot.bnd\
+}
+
+-releaserepo: Release,${def;mavenPublishRepository;RemoteMavenRepository,LocalMavenRepository}
+
+# Reproducible build - do not put headers which insert build timestamp, other than we wish
+-noextraheaders: true
+-reproducible: true
 
 # Always use contracts
 -contract: *
@@ -78,3 +90,16 @@ testpath: \
 
 javac.source: 17
 javac.target: 17
+
+_remoteMavenSnapshotRepository=${def;remoteMavenSnapshotRepository;https://oss.sonatype.org/content/repositories/snapshots/}
+_remoteMavenReleaseRepository=${def;remoteMavenReleaseRepository;https://oss.sonatype.org/service/local/staging/deploy/maven2/}
+-plugin.repositories.mavenRemote: \
+	aQute.bnd.repository.maven.provider.MavenBndRepository; \
+		name='RemoteMavenRepository'; \
+		snapshotUrl="${_remoteMavenSnapshotRepository}"; \
+		releaseUrl="${_remoteMavenReleaseRepository}"; \
+		noupdateOnRelease=true
+-plugin.repositories.mavenLocal: \
+	aQute.bnd.repository.maven.provider.MavenBndRepository; \
+		name='MavenLocalRepository'; \
+		noupdateOnRelease=true
diff --git a/cnf/release.bnd b/cnf/release.bnd
@@ -0,0 +1,12 @@
+mavenRemoteRelease: remote, pom;path=JAR, sources, javadoc, \
+	${if;${is;${env;GPG_PASSPHRASE;UNSET};UNSET};;sign\\;passphrase="${first;${env;GPG_PASSPHRASE};DEFAULT}"}
+# snapshot instruction must not be set, otherwise it causes bnd to deploy into snapshot repository
+# -snapshot
+
+# trigger maven deploy
+-maven-release: ${if;${def;mavenPublishRepository};${mavenRemoteRelease}}
+
+# trigger maven deploy
+-pom: \
+	groupid=io.openems, \
+	version=${versionmask;===;${@version}}
diff --git a/cnf/snapshot.bnd b/cnf/snapshot.bnd
@@ -0,0 +1,9 @@
+mavenRemoteRelease: remote;${-snapshot}, pom;path=JAR, sources
+-snapshot: ${tstamp}
+
+# trigger maven deploy
+-maven-release: ${if;${def;mavenPublishRepository};${mavenRemoteRelease}}
+
+-pom: \
+	groupid=io.openems, \
+	version=${versionmask;===;${@version}}-SNAPSHOT
diff --git a/doc/modules/ROOT/pages/edge/implement.adoc b/doc/modules/ROOT/pages/edge/implement.adoc
@@ -92,7 +92,7 @@ io.openems.edge.meter.api::
 Bundle-Name: OpenEMS Edge Meter Simulated
 Bundle-Vendor: OpenEMS Association e.V.
 Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
+
 
 -buildpath: \
 	${buildpath},\

diff --git a/doc/modules/ROOT/pages/i18n/de.po b/doc/modules/ROOT/pages/i18n/de.po
@@ -3261,7 +3261,7 @@ msgid ""
 "Bundle-Name: OpenEMS Edge Meter Simulated\n"
 "Bundle-Vendor: OpenEMS Association e.V.\n"
 "Bundle-License: https://opensource.org/licenses/EPL-2.0\n"
-"Bundle-Version: 1.0.0.${tstamp}\n"
+"\n"
 "Export-Package: \\\n"
 "\tio.openems.edge.meter.api,\\\n"
 "\tio.openems.edge.meter.asymmetric.api,\\\n"
@@ -3271,7 +3271,7 @@ msgstr ""
 "Bundle-Name: OpenEMS Edge Meter Simulated\n"
 "Bundle-Vendor: OpenEMS Association e.V.\n"
 "Bundle-License: https://opensource.org/licenses/EPL-2.0\n"
-"Bundle-Version: 1.0.0.${tstamp}\n"
+"\n"
 "Export-Paket: \\\n"
 "\tio.openems.edge.meter.api,\\\n"
 "\tio.openems.edge.meter.asymmetric.api,\\\n"

diff --git a/doc/modules/ROOT/pages/i18n/translate.pot b/doc/modules/ROOT/pages/i18n/translate.pot
@@ -3712,7 +3712,7 @@ msgid ""
 "Bundle-Name: OpenEMS Edge Meter Simulated\n"
 "Bundle-Vendor: OpenEMS Association e.V.\n"
 "Bundle-License: https://opensource.org/licenses/EPL-2.0\n"
-"Bundle-Version: 1.0.0.${tstamp}\n"
+"\n"
 "Export-Package: \\\n"
 "\tio.openems.edge.meter.api,\\\n"
 "\tio.openems.edge.meter.asymmetric.api,\\\n"

diff --git a/io.openems.backend.alerting/bnd.bnd b/io.openems.backend.alerting/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend Alerting
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.application/bnd.bnd b/io.openems.backend.application/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.b2brest/bnd.bnd b/io.openems.backend.b2brest/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend-to-Backend REST-Api
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.b2bwebsocket/bnd.bnd b/io.openems.backend.b2bwebsocket/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend-to-Backend Websocket
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.common/bnd.bnd b/io.openems.backend.common/bnd.bnd
@@ -1,11 +1,8 @@
 Bundle-Name: OpenEMS Backend Common
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version:	1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
 	io.openems.common
 
 -testpath: \
-	${testpath}
+	${testpath}
diff --git a/io.openems.backend.core/bnd.bnd b/io.openems.backend.core/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend Core
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version:	1.0.0.${tstamp}
 Bundle-Description: Supportive services that are used throughout OpenEMS Backend
 
 -buildpath: \

diff --git a/io.openems.backend.edgewebsocket/bnd.bnd b/io.openems.backend.edgewebsocket/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend EdgeWebsocket Impl
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.metadata.dummy/bnd.bnd b/io.openems.backend.metadata.dummy/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend Metadata Dummy
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.metadata.file/bnd.bnd b/io.openems.backend.metadata.file/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend Metadata File
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.metadata.odoo/bnd.bnd b/io.openems.backend.metadata.odoo/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend Odoo Impl
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
@@ -10,6 +7,6 @@ Bundle-Version: 1.0.0.${tstamp}
 	io.openems.common,\
 	io.openems.wrapper.aXMLRPC,\
 	org.postgresql.jdbc, \
-	
+
 -testpath: \
 	${testpath}
diff --git a/io.openems.backend.timedata.aggregatedinflux/bnd.bnd b/io.openems.backend.timedata.aggregatedinflux/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend Timedata Aggregated InfluxDB
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.timedata.dummy/bnd.bnd b/io.openems.backend.timedata.dummy/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend Timedata Dummy
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.timedata.influx/bnd.bnd b/io.openems.backend.timedata.influx/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Backend Timedata InfluxDB
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.timedata.timescaledb/bnd.bnd b/io.openems.backend.timedata.timescaledb/bnd.bnd
@@ -1,7 +1,6 @@
 Bundle-Name: OpenEMS Backend Timedata TimescaleDB
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
+
+
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.backend.uiwebsocket/bnd.bnd b/io.openems.backend.uiwebsocket/bnd.bnd
@@ -1,7 +1,6 @@
 Bundle-Name: OpenEMS Backend UiWebsocket Impl
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
+
+
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.common/bnd.bnd b/io.openems.common/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Common
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.common/resources/templates/api/bnd.bnd b/io.openems.common/resources/templates/api/bnd.bnd
@@ -1,7 +1,5 @@
 Bundle-Name: OpenEMS Edge $projectName$ Api
 Bundle-Vendor: OpenEMS Association e.V.
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.\${tstamp}
 
 -buildpath: \
 	\${buildpath},\

diff --git a/io.openems.common/resources/templates/controller/bnd.bnd b/io.openems.common/resources/templates/controller/bnd.bnd
@@ -1,7 +1,5 @@
 Bundle-Name: OpenEMS Edge Controller $projectName$
 Bundle-Vendor: OpenEMS Association e.V.
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.\${tstamp}
 
 -buildpath: \
 	\${buildpath},\

diff --git a/io.openems.common/resources/templates/device-modbus/bnd.bnd b/io.openems.common/resources/templates/device-modbus/bnd.bnd
@@ -1,7 +1,5 @@
 Bundle-Name: OpenEMS Edge $projectName$
 Bundle-Vendor: OpenEMS Association e.V.
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.\${tstamp}
 
 -buildpath: \
 	\${buildpath},\

diff --git a/io.openems.common/resources/templates/device/bnd.bnd b/io.openems.common/resources/templates/device/bnd.bnd
@@ -1,7 +1,5 @@
 Bundle-Name: OpenEMS Edge $projectName$
 Bundle-Vendor: OpenEMS Association e.V.
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.\${tstamp}
 
 -buildpath: \
 	\${buildpath},\

diff --git a/io.openems.edge.application/bnd.bnd b/io.openems.edge.application/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Edge
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
@@ -10,4 +7,3 @@ Bundle-Version: 1.0.0.${tstamp}
 
 -testpath: \
 	${testpath}
-
diff --git a/io.openems.edge.battery.api/bnd.bnd b/io.openems.edge.battery.api/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Edge Battery Api
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\

diff --git a/io.openems.edge.battery.bmw/bnd.bnd b/io.openems.edge.battery.bmw/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Edge BMW Battery  
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
@@ -12,4 +9,4 @@ Bundle-Version: 1.0.0.${tstamp}
 	io.openems.edge.common
 
 -testpath: \
-	${testpath}
+	${testpath}
diff --git a/io.openems.edge.battery.bydcommercial/bnd.bnd b/io.openems.edge.battery.bydcommercial/bnd.bnd
@@ -1,7 +1,4 @@
 Bundle-Name: OpenEMS Edge BYD Battery-Box Commercial
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
@@ -13,4 +10,4 @@ Bundle-Version: 1.0.0.${tstamp}
 	io.openems.edge.ess.api
 
 -testpath: \
-	${testpath}
+	${testpath}
diff --git a/io.openems.edge.battery.fenecon.commercial/bnd.bnd b/io.openems.edge.battery.fenecon.commercial/bnd.bnd
@@ -1,7 +1,6 @@
 Bundle-Name: OpenEMS Edge Battery FENECON Commercial
-Bundle-Vendor: FENECON GmbH
-Bundle-License: https://opensource.org/licenses/EPL-2.0
-Bundle-Version: 1.0.0.${tstamp}
+
+
 
 -buildpath: \
 	${buildpath},\