Skip to content

Commit

Permalink
Merge pull request #2648 from jlawyerorg/master
Browse files Browse the repository at this point in the history
merge master into release for version 3.0.0.1
  • Loading branch information
j-dimension authored Nov 4, 2024
2 parents f741fe3 + 876fb82 commit c539232
Show file tree
Hide file tree
Showing 1,206 changed files with 211,659 additions and 14,625 deletions.
40 changes: 18 additions & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
distribution: 'liberica'
java-version: '11' # The JDK version to make available on the path.
java-package: jdk+fx # (jre, jdk, or jdk+fx) - defaults to jdk
architecture: x64 # (x64 or x86) - defaults to x64
Expand All @@ -48,11 +49,6 @@ jobs:
wget -O /home/runner/j-lawyer-backup/backups.tar.gz https://www.j-lawyer.org/downloads/travisci/backups/backups.tar.gz
tar -m -xvzf /home/runner/j-lawyer-backup/backups.tar.gz -C /home/runner/j-lawyer-backup
# - name: Set up JDK8
# uses: AdoptOpenJDK/install-jdk@v1
# with:
# version: '8'
# architecture: x64
- name: Set up JDK11
uses: AdoptOpenJDK/install-jdk@v1
Expand All @@ -64,7 +60,7 @@ jobs:
- name: populate JAVA_HOME to Java 11
run: echo "JAVA_HOME=$(echo $JDK_11)" >> $GITHUB_ENV

- name: Build server with JDK8
- name: Build server with JDK11
# ejb tests fail for some reason...
# run: ant -buildfile j-lawyer-fax/build.xml default && ant -buildfile j-lawyer-server-common/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default && ant -buildfile j-lawyer-server-api/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml default test && ant -buildfile j-lawyer-io-common/build.xml default
run: ant -buildfile j-lawyer-fax/build.xml default && ant -buildfile j-lawyer-server-common/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default && ant -buildfile j-lawyer-server-api/build.xml default && ant -Dplatforms.default_platform.home=$JDK_11 -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml default && ant -buildfile j-lawyer-io-common/build.xml default
Expand All @@ -81,19 +77,19 @@ jobs:
backupdirectory: /home/runner/j-lawyer-backup
datadirectory: /home/runner/j-lawyer-data
encryptionpwd:

# - name: Set up JDK11
# uses: AdoptOpenJDK/install-jdk@v1
# with:
# version: '11'
# architecture: x64
# targets: 'JDK_11'
#
# - name: populate JAVA_HOME to Java 11
# run: echo "JAVA_HOME=$(echo $JDK_11)" >> $GITHUB_ENV

- name: Build client with JDK11
run: ant -buildfile j-lawyer-client/build.xml default
- name: Set up JDK17
uses: AdoptOpenJDK/install-jdk@v1
with:
version: '17'
architecture: x64
targets: 'JDK_17'

- name: populate JAVA_HOME to Java 17
run: echo "JAVA_HOME=$(echo $JDK_17)" >> $GITHUB_ENV

- name: Build client with JDK 17
run: ant -Dplatforms.JDK_17.home=$JDK_17 -buildfile j-lawyer-client/build.xml test jar
# removed temporarily: && mvn -f j-lawyer-backupmgr/pom.xml clean package test
env:
ftpuser: ${{ secrets.FTPUSER }}
Expand All @@ -115,9 +111,9 @@ jobs:
-Dsonar.organization=jlawyerorg
-Dsonar.projectKey=jlawyerorg_j-lawyer-org
-Dsonar.projectName=j-lawyer-org
-Dsonar.projectVersion=2.3.1
-Dsonar.projectVersion=2.6.0
-Dsonar.java.binaries=.
-Dsonar.java.source=8
-Dsonar.java.source=11
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/pullrequests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: actions/setup-java@v1
with:
java-version: '11' # The JDK version to make available on the path.
java-version: '17' # The JDK version to make available on the path.
java-package: jdk+fx # (jre, jdk, or jdk+fx) - defaults to jdk
architecture: x64 # (x64 or x86) - defaults to x64

Expand All @@ -48,13 +48,13 @@ jobs:
wget -O /home/runner/j-lawyer-backup/backups.tar.gz https://www.j-lawyer.org/downloads/travisci/backups/backups.tar.gz
tar -m -xvzf /home/runner/j-lawyer-backup/backups.tar.gz -C /home/runner/j-lawyer-backup
- name: Set up JDK8
- name: Set up JDK17
uses: AdoptOpenJDK/install-jdk@v1
with:
version: '8'
version: '17'
architecture: x64

- name: Build server with JDK8
- name: Build server with JDK17
# ejb tests fail for some reason...
# run: ant -buildfile j-lawyer-fax/build.xml default && ant -buildfile j-lawyer-server-common/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default && ant -buildfile j-lawyer-server-api/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml default test && ant -buildfile j-lawyer-io-common/build.xml default
# run j-lawyer-fax without tests, does not need to access the real account
Expand All @@ -73,17 +73,17 @@ jobs:
datadirectory: /home/runner/j-lawyer-data
encryptionpwd:

- name: Set up JDK11
- name: Set up JDK17
uses: AdoptOpenJDK/install-jdk@v1
with:
version: '11'
version: '17'
architecture: x64
targets: 'JDK_11'
targets: 'JDK_17'

- name: populate JAVA_HOME to Java 11
run: echo "JAVA_HOME=$(echo $JDK_11)" >> $GITHUB_ENV
- name: populate JAVA_HOME to Java 17
run: echo "JAVA_HOME=$(echo $JDK_17)" >> $GITHUB_ENV

- name: Build client with JDK11
- name: Build client with JDK17
run: ant -buildfile j-lawyer-client/build.xml default
# removed temporarily: && mvn -f j-lawyer-backupmgr/pom.xml clean package test
env:
Expand All @@ -106,9 +106,9 @@ jobs:
-Dsonar.organization=jlawyerorg
-Dsonar.projectKey=jlawyerorg_j-lawyer-org
-Dsonar.projectName=j-lawyer-org
-Dsonar.projectVersion=2.2.0
-Dsonar.projectVersion=2.6.0
-Dsonar.java.binaries=.
-Dsonar.java.source=8
-Dsonar.java.source=11
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,12 @@
/j-lawyer-server/j-lawyer-server-ejb/test/data/template-emptyline-run.docx
/j-lawyer-server/j-lawyer-server-ejb/test/data/template-scripts-run.odt
/j-lawyer-server/j-lawyer-server-ejb/test/data/template-scripts-run.docx
/j-lawyer-client/ksspt.jpg
/j-lawyer-client/ks.jpg.prd2
/j-lawyer-server/j-lawyer-server-ejb/src/java/org.docx
/j-lawyer-server/j-lawyer-server-ejb/src/java/body.docx
/j-lawyer-server/j-lawyer-server-ejb/src/java/header.docx
/j-lawyer-fax/test/org/jlawyer/tests/test.pdf
/j-lawyer-server/j-lawyer-io/addbasicauth-error.log
/j-lawyer-server/j-lawyer-io/addbasicauth.log
/j-lawyer-invoicing/target/
5 changes: 4 additions & 1 deletion build-fast.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ function check_error {
fi
}

export JAVA_HOME=/home/jens/bin/jdk1.8.0_131
# export JAVA_HOME=/home/jens/bin/jdk-17.0.9-full/
# export JAVA_HOME=/home/jens/bin/jdk1.8.0_131
export JAVA_HOME=/home/jens/bin/jdk-11.0.9.1-full/

# there is an OpenJDK bug on Ubuntu, causing Surefire tests to fail - skip tests for now
mvn -f j-lawyer-cloud/pom.xml install -DskipTests
Expand All @@ -24,6 +26,7 @@ ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xm
check_error $?
ant -buildfile j-lawyer-server-api/build.xml jar
check_error $?
# ant -Dplatforms.default_platform.home=/home/jens/bin/jdk-17.0.9-full/ -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml dist
ant -Dplatforms.default_platform.home=/home/jens/bin/jdk-11.0.9.1-full/ -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml dist
check_error $?
ant -buildfile j-lawyer-io-common/build.xml jar
Expand Down
48 changes: 48 additions & 0 deletions build-windows.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/bash

# requires: sudo apt-get install openjfx

# set tools
export ANTEXEC=../tools/apache-ant-1.10.14/bin/ant
export MVNEXEC=../tools/apache-maven-3.9.7/bin/mvn

export JDK17=../tools/jdk-17.0.11-full/
export JDK11=../tools/jdk-11.0.23-full/
export JDK8=../tools/jdk8u412-full/

# skips tests
function check_error {
if [ $1 -gt 0 ]; then
echo "Found error!"
exit 1
fi
}

# export JAVA_HOME=/home/jens/bin/jdk-17.0.9-full/
export JAVA_HOME=$JDK17

# there is an OpenJDK bug on Ubuntu, causing Surefire tests to fail - skip tests for now
$MVNEXEC -f j-lawyer-cloud/pom.xml install -DskipTests
check_error $?

$ANTEXEC -buildfile j-lawyer-fax/build.xml jar
check_error $?
$ANTEXEC -buildfile j-lawyer-server-common/build.xml jar
check_error $?
$ANTEXEC -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml dist
check_error $?
$ANTEXEC -buildfile j-lawyer-server-api/build.xml jar
check_error $?
export JAVA_HOME=$JDK8
$ANTEXEC -Dplatforms.default_platform.home=$JDK11 -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml dist
check_error $?
$ANTEXEC -buildfile j-lawyer-io-common/build.xml jar
check_error $?
export JAVA_HOME=$JDK17
$ANTEXEC -Dplatforms.JDK_17.home=$JDK17 -buildfile j-lawyer-client/build.xml jar
check_error $?

# export JAVA_HOME=/home/jens/bin/jdk8u265-full/
# there is an OpenJDK bug on Ubuntu, causing Surefire tests to fail - skip tests for now
# $MVNEXEC -f j-lawyer-backupmgr/pom.xml package -DskipTests -Djava.home=/home/jens/bin/jdk8u265-full/jre

3 changes: 3 additions & 0 deletions deploy-windows.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

cp j-lawyer-server/dist/j-lawyer-server.ear ../wildfly-26.1.3.Final/standalone/deployments/j-lawyer-server.ear
2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

cp j-lawyer-server/dist/j-lawyer-server.ear ~/bin/wildfly-16.0.0.Final//standalone/deployments/j-lawyer-server.ear
cp j-lawyer-server/dist/j-lawyer-server.ear ~/bin/wildfly-26.1.3.Final/standalone/deployments/j-lawyer-server.ear
2 changes: 1 addition & 1 deletion docker/getversion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jlversion=`echo "$jlversion" | tr _ .`

# tadaaa!
# echo $jlversion
echo 2.4.0.13
echo 3.0.0.1

2 changes: 1 addition & 1 deletion docker/mysql/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Docker + Ubuntu-16.04 + Mysql-5.7
Docker + Ubuntu + Mysql-5.7

#### parameter

Expand Down
Loading

0 comments on commit c539232

Please sign in to comment.