Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRAFT: #414: Bump java version and Pi4j #415

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
4 changes: 2 additions & 2 deletions .github/workflows/ci-develop-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Upload distribution files to staging
uses: actions/upload-artifact@v4
with:
name: pi4j-v2-dist
name: pi4j-dist
path: staging
DeployPackages:
name: Deploy to APT/Download Repo
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Download staged artifacts from build
uses: actions/download-artifact@v4
with:
name: pi4j-v2-dist
name: pi4j-dist
- name: Display downloaded build artifacts
shell: bash
run: tree
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
- name: Upload distribution files to staging
uses: actions/upload-artifact@v4
with:
name: pi4j-v2-dist
name: pi4j-dist
path: staging
4 changes: 2 additions & 2 deletions .github/workflows/ci-release-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Upload distribution files to staging
uses: actions/upload-artifact@v4
with:
name: pi4j-v2-dist
name: pi4j-dist
path: staging
DeployPackages:
name: Deploy to APT/Download Repo
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Download staged artifacts from build
uses: actions/download-artifact@v4
with:
name: pi4j-v2-dist
name: pi4j-dist
- name: Display downloaded build artifacts
shell: bash
run: tree
Expand Down
19 changes: 19 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.pi4j/pi4j-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.pi4j/pi4j-core)
[![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/com.pi4j/pi4j-core?server=https%3A%2F%2Foss.sonatype.org)](https://oss.sonatype.org/#nexus-search;gav~com.pi4j~~~~)
[![License](https://img.shields.io/github/license/pi4j/pi4j-v2)](http://www.apache.org/licenses/LICENSE-2.0)
[![License](https://img.shields.io/github/license/pi4j/pi4j)](http://www.apache.org/licenses/LICENSE-2.0)

[![Site](https://img.shields.io/badge/Website-pi4j.com-green)](https://pi4j.com)
[![Chat on Slack](https://img.shields.io/badge/Chat-on%20Slack-blue)](https://join.slack.com/t/pi4j/shared_invite/zt-1ttqt8wgj-E6t69qaLrNuCMPLiYnBCsg)
Expand All @@ -24,8 +24,8 @@ This project is intended to provide a **friendly object-oriented I/O API and imp

![Pi4J diagram](https://pi4j.com/assets/about/home/pi4j-overview.jpg)

* Pi4J V2 Discussions: [github.com/Pi4J/pi4j-v2/discussions](https://github.com/Pi4J/pi4j-v2/discussions)
* Pi4J V2 issues: [github.com/Pi4J/pi4j-v2/issues](https://github.com/Pi4J/pi4j-v2/issues)
* Pi4J V2 Discussions: [github.com/Pi4J/pi4j/discussions](https://github.com/Pi4J/pi4j/discussions)
* Pi4J V2 issues: [github.com/Pi4J/pi4j/issues](https://github.com/Pi4J/pi4j/issues)

Builds are available from:

Expand Down Expand Up @@ -60,15 +60,15 @@ while (true) {
For full description of the code structure, how to compile... see
the ["About the code" on our website](https://pi4j.com/architecture/about-the-code/).

![Pi4J V2 code structure](assets/draw.io/pi4j-v2-code-structure.jpg)
![Pi4J V2 code structure](assets/draw.io/pi4j-code-structure.jpg)

### Project Overview

Starting with the Pi4J 2.0 builds, the Pi4J project is prioritizing focus
on providing Java programs access, control and communication with the core
I/O capabilities of the Raspberry Pi platform.

Read all about it on [pi4j.com: "What’s New in 2.0?"](https://pi4j.com/about/new-in-v2/).
Read all about it on [pi4j.com: "What’s New in 2.0?"](https://pi4j.com/about/new-in/).

### Build Instructions

Expand Down Expand Up @@ -109,10 +109,10 @@ with your experience, ideas, and what you would like to contribute to the projec

* **Releases**
* V1: [github.com/Pi4J/pi4j-v1/releases](https://github.com/Pi4J/pi4j-v1/releases) (archived)
* V2: [github.com/Pi4J/pi4j-v2/releases](https://github.com/Pi4J/pi4j-v2/releases)
* V2: [github.com/Pi4J/pi4j/releases](https://github.com/Pi4J/pi4j/releases)
* **Source Code**:
* V1: [github.com/Pi4J/pi4j-v1/branches](https://github.com/Pi4J/pi4j-v1/branches) (archived)
* V2: [github.com/Pi4J/pi4j-v2/branches](https://github.com/Pi4J/pi4j-v2/branches)
* V2: [github.com/Pi4J/pi4j/branches](https://github.com/Pi4J/pi4j/branches)

## License

Expand Down
2 changes: 1 addition & 1 deletion libraries/pi4j-library-gpiod/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.pi4j</groupId>
<artifactId>pi4j-library</artifactId>
<version>2.7.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pi4j-library/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libraries/pi4j-library-linuxfs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>pi4j-library</artifactId>
<groupId>com.pi4j</groupId>
<version>2.7.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pi4j-library/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libraries/pi4j-library-pigpio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>pi4j-library</artifactId>
<groupId>com.pi4j</groupId>
<version>2.7.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pi4j-library/pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ JNIEXPORT jint JNICALL Java_com_pi4j_library_pigpio_internal_PIGPIO_gpioHardware
JNIEXPORT jint JNICALL Java_com_pi4j_library_pigpio_internal_PIGPIO_gpioInitialise
(JNIEnv *env, jclass class)
{
// SEE: https://github.com/Pi4J/pi4j-v2/issues/15
// SEE: https://github.com/Pi4J/pi4j/issues/15
// By default, PIGPIO steals all the signal handlers. The JVM doesn't like this
// as it uses them in running the JVM so it ends up with the program crashing.
// The following should disable the signal handlers inside the PIGPIO library.
Expand Down
2 changes: 1 addition & 1 deletion libraries/pi4j-library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>pi4j-parent</artifactId>
<groupId>com.pi4j</groupId>
<version>2.7.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Loading