Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
run: chmod +x gradlew

- name: Check code formatting
run: ./gradlew spotlessCheck --no-daemon || true
run: ./gradlew spotlessCheck --no-daemon
env:
GRADLE_OPTS: -Xmx2g -Dorg.gradle.daemon=false

Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@ jobs:
README.md \
pnnl.goss.core/LICENSE

- name: Determine release version
id: release_version
run: |
# Strip the leading 'v' from the tag (v16.0.0 -> 16.0.0) so the
# asset glob below matches only this release's jars, not the
# full cnf/releaserepo/ history of every prior release.
version="${{ github.ref_name }}"
echo "version=${version#v}" >> "$GITHUB_OUTPUT"

- name: Create GitHub Release
uses: softprops/action-gh-release@v2
with:
Expand All @@ -94,7 +103,7 @@ jobs:
prerelease: ${{ contains(github.ref_name, 'rc') || contains(github.ref_name, 'beta') || contains(github.ref_name, 'alpha') }}
files: |
dist/*.tar.gz
cnf/releaserepo/**/*.jar
cnf/releaserepo/**/*-${{ steps.release_version.outputs.version }}.jar
generate_release_notes: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion pnnl.goss.core.itests/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT

# Build dependencies - JUnit 5
# Note: Using osgi-core-buildpath only (not full osgi-buildpath) to avoid javax.jms from osgi.enterprise
Expand Down
2 changes: 1 addition & 1 deletion pnnl.goss.core.itests/itest.bnd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Modern OSGi Integration Test Configuration
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT

# Use JUnit 5 and OSGi Test
# Note: Using osgi-core-buildpath to avoid javax.jms from osgi.enterprise
Expand Down
2 changes: 1 addition & 1 deletion pnnl.goss.core.runner/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
-buildpath: \
org.apache.felix.gogo.command,\
org.apache.felix.gogo.runtime,\
Expand Down
2 changes: 1 addition & 1 deletion pnnl.goss.core.testutil/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
-buildpath: \
${configadmin-buildpath},\
pnnl.goss.core.core-api,\
Expand Down
2 changes: 1 addition & 1 deletion pnnl.goss.core/core-api.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Export-Package: \
com.northconcepts.exception,\
pnnl.goss.core
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-client.bnd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Export-Package: \
pnnl.goss.core.client
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-commands.bnd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.commands
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-exceptions.bnd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Private-Package: \
pnnl.goss.core.exception
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
Export-Package: \
com.northconcepts.exception
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-security.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Private-Package: \
# The Activator class provides SecurityManager via @Component annotation
Export-Package: \
pnnl.goss.core.security
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT

# Require FileInstall to be present in the runtime
# FileInstall watches the conf directory for .cfg files and loads them into ConfigAdmin
Expand Down
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-server-api.bnd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Export-Package: \
pnnl.goss.core.server
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-server-registry.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
Private-Package: \
pnnl.goss.server.registry
DynamicImport-Package: *
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-server-web.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ DynamicImport-Package: *
Private-Package: \
pnnl.goss.core.server.web

Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT

# Import webroot folder to path resources/webroot
Include-Resource: resources/webroot=webroot
Expand Down
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-server.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Import-Package: \
*
#Include-Resource: \
# OSGI-INF/blueprint/blueprint.xml=config/blueprint.xml
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion pnnl.goss.core/security-jwt.bnd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Private-Package: pnnl.goss.core.security.jwt
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion pnnl.goss.core/security-ldap.bnd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.security.ldap
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion pnnl.goss.core/security-propertyfile.bnd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.security.propertyfile
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion pnnl.goss.core/security-system.bnd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Private-Package: pnnl.goss.core.security.system
Bundle-Version: 16.0.1-SNAPSHOT
Bundle-Version: 16.0.0-SNAPSHOT
Loading