From 5dce2507c33d6dc6819a1dd5d130ca744517b3eb Mon Sep 17 00:00:00 2001
From: geopossachs <10324450+geopossachs@users.noreply.github.com>
Date: Sun, 22 Oct 2023 13:33:58 +0200
Subject: [PATCH] Feature/jakarta 10 (#1193)
* add a simple ci pipeline for drone.io
* use JKD11 as default like jakarta too
---
.drone.yml | 47 ++++++++++++++++++++++++++
.drone_maven_settings.xml | 14 ++++++++
build.gradle | 2 +-
build.properties | 5 ++-
gradleResources/Bootstrap/build.gradle | 1 -
pom.xml | 36 ++++++++++++++++----
settings.gradle | 18 +++++-----
7 files changed, 105 insertions(+), 18 deletions(-)
create mode 100644 .drone.yml
create mode 100644 .drone_maven_settings.xml
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 000000000..7f0c7bee0
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,47 @@
+kind: pipeline
+name: default
+
+steps:
+
+# build the project with gradle
+- name: gradle-library-build
+ image: openjdk:11-jdk
+ commands:
+ - ./gradlew --no-daemon -b build.gradle clean buildResources :javaBuild:defaultJar :javaBuild:buildJava11Jar :javaBuild:buildJava17Jar
+ - ls -lisa ./javaBuild/build/libs/
+ volumes:
+ - name: maven-cache
+ path: /root/.m2
+
+# build the project with maven
+- name: maven-library-package
+ image: maven:3.6-jdk-11
+ commands:
+ - mvn clean package #-P MavenCentral
+ - cd ./target/
+ - ls -lisa
+ volumes:
+ - name: maven-cache
+ path: /root/.m2
+
+# to refresh the showcase, deploy a snapshot to 'GitHub Packages'
+- name: maven-library-deploy
+ when:
+ repo:
+ - geopossachs/BootsFaces-OSP
+ image: maven:3.6-jdk-11
+ commands:
+ - mvn -s ./.drone_maven_settings.xml clean deploy -P geopossachs
+ environment:
+ GITHUB_USERNAME: geopossachs
+ GITHUB_ACCESS_TOKEN:
+ from_secret: githab_access_token
+ volumes:
+ - name: maven-cache
+ path: /root/.m2
+
+
+volumes:
+ - name: maven-cache
+ host:
+ path: /temp/drone/m2cache
\ No newline at end of file
diff --git a/.drone_maven_settings.xml b/.drone_maven_settings.xml
new file mode 100644
index 000000000..cd2b53951
--- /dev/null
+++ b/.drone_maven_settings.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ github
+ ${env.GITHUB_USERNAME}
+ ${env.GITHUB_ACCESS_TOKEN}
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e4e9049a9..e5b35eb1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -105,4 +105,4 @@ showConfig.doFirst {
}
//By default build also the default( plain Bootstrap without Themes ) Jar for Java 8 and 9 only
-defaultTasks 'showConfig', ':javaBuild:defaultJar',':javaBuild:buildJava11Jar', ':javaBuild:buildJava8Jar' //':java8:defaultJar', ':java11:defaultJar', ':java17:defaultJar' //Java 17 LTS
+defaultTasks 'showConfig', ':javaBuild:defaultJar',':javaBuild:buildJava11Jar', ':javaBuild:buildJava17Jar' //':java8:defaultJar', ':java11:defaultJar', ':java17:defaultJar' //Java 17 LTS
diff --git a/build.properties b/build.properties
index feed5bd75..5e5a4b58f 100644
--- a/build.properties
+++ b/build.properties
@@ -29,6 +29,7 @@ VERSION=1.6.0
# or don't remove the property but just leave it blank for a Final RELEASE :
# RELEASE-STATUS=
RELEASE-STATUS=SNAPSHOT
+
bootstrap.version=3.4.1
# Set global properties for this build
@@ -55,7 +56,7 @@ bootswatch.theme=cerulean,cosmo,cyborg,darkly,flatly,journal,lumen,paper,readabl
bootswatch.subversion=+1
# PatternFly support
-patternfly.version=3.18.1
+patternfly.version=3.59.5
# Optional Java target Compatibility properties
# You can build for multiple targets setting to 'Yes'(without quotes) the corresponding option
@@ -66,6 +67,7 @@ patternfly.version=3.18.1
# Default Build uses Java 8, you can build tdditional jars for the other LTS releases by setting to yes the corresponding variable.
java11=YES
java17=YES
+
# ADVANCED: Optional javac target compilation properties
# You can specify comma separated options for every target java version
# Examples
@@ -88,5 +90,6 @@ java17=YES
#java8opts=-g,-Xlint:unchecked
#java8opts=-g:none
java8opts=-Xlint:all
+
# ADVANCED: Optional bootClasspath compilation (default is No)
#enableBootClasspath=Yes
diff --git a/gradleResources/Bootstrap/build.gradle b/gradleResources/Bootstrap/build.gradle
index 22f9e1a11..9e689500c 100644
--- a/gradleResources/Bootstrap/build.gradle
+++ b/gradleResources/Bootstrap/build.gradle
@@ -34,7 +34,6 @@ ext.bootswatchZipFolder = 'bootswatch-'+BootswatchFullVersion.replace('+','-')
def bootswatchZip = new File(buildDir, 'bootswatch-'+BootswatchFullVersion.replace('+','-')+'.zip')
ext.downloadPatternFlyURL = 'https://github.com/patternfly/patternfly-3/archive/v'+PatternFlyVersion+'.zip'
-
def PatternFlyZip = new File(buildDir, 'patternfly-'+PatternFlyVersion+'.zip')
task themesTask {
diff --git a/pom.xml b/pom.xml
index 912c0487d..b17605163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,8 @@
yyyyMMdd-HH:mm:ss
- 1.8
- 1.8
+ 11
+ 11
true
lines,vars,source
@@ -97,8 +97,11 @@
versions-maven-plugin
2.7
-
+
+
org.eclipse.m2e
lifecycle-mapping
@@ -124,7 +127,7 @@
-
+
@@ -195,7 +198,7 @@
-
+
Mojarra2.2.12
@@ -283,6 +286,27 @@
+
+
+ geopossachs
+
+ false
+
+
+
+ github
+ GitHub Apache Maven Packages
+ https://maven.pkg.github.com/geopossachs/BootsFaces-OSP
+
+
+
+
diff --git a/settings.gradle b/settings.gradle
index 4a309ca77..f650686b8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,13 +23,13 @@ rootProject.name = 'BootsFaces'
include 'gradleResources'
include 'gradleResources:Bootstrap'
include 'gradleResources:compileLess'
-//DEPRECATED//include 'legacyJava'
-//DEPRECATED//include 'legacyJava:java7'
-//DEPRECATED//include 'legacyJava:java9'
-//DEPRECATED//include 'legacyJava:java10'
-//OBSLOETE//include 'java8'
-//DEPRECATED//include 'java9'
-//DEPRECATED//include 'java10'
-//OBSLOETE//include 'java11'
-//OBSLOETE//include 'java17'
+//DEPRECATED //include 'legacyJava'
+//DEPRECATED //include 'legacyJava:java7'
+//DEPRECATED //include 'legacyJava:java9'
+//DEPRECATED //include 'legacyJava:java10'
+//OBSLOETE //include 'java8'
+//DEPRECATED //include 'java9'
+//DEPRECATED //include 'java10'
+//OBSLOETE //include 'java11'
+//OBSLOETE //include 'java17'
include 'javaBuild'