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

Feature/jakarta 10 #1193

Merged
merged 29 commits into from
Oct 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
99e7ed6
add a simple ci pipeline for drone.io
geopossachs Jan 9, 2021
97803e5
found only tag v3.59.4 on github https://github.com/patternfly/patter…
geopossachs Jan 9, 2021
b5286f8
mirror the old version of patternfly
geopossachs Jan 9, 2021
456eafb
Merge branch 'master2' into feature/build-with-drone
geopossachs Oct 17, 2021
caec021
#1178 allow using regular icon-awesome for DateTimePicker when requested
Nov 2, 2021
3f38afe
Bump owasp-java-html-sanitizer from 20191001.1 to 20211018.1
dependabot[bot] Oct 19, 2021
9bc891c
Update Gradle Wrapper to v6.9.1 (bugfixes and backorts from 7.0).
TheCoder4eu Nov 7, 2021
06a9c67
#1180 support for JakartaEE 9 (work in progress)
stephanrauh Dec 18, 2021
ab267d9
Update jQuery to v3.6.0
stephanrauh Dec 18, 2021
9a4f2d3
Bump asset-pipeline-gradle to v3.3.3 .
TheCoder4eu Dec 27, 2021
258a4be
Update Gradle Wrapper to v6.9.2
TheCoder4eu Dec 27, 2021
a9a2964
Gradle Build rewrite to improve efficiency, drop legacy Java and buil…
TheCoder4eu Dec 30, 2021
6203cb7
Fix for https://github.com/TheCoder4eu/BootsFaces-OSP/issues/750
t-oster Jan 10, 2022
c0820fb
updated the README
stephanrauh Oct 1, 2023
45ee30e
Merge branch 'master' into feature/build-with-drone
geopossachs Oct 7, 2023
4b5ee04
build with jdk8 at frist
geopossachs Oct 8, 2023
6a456c0
build with jdk8 at frist
geopossachs Oct 8, 2023
0f5b163
build with gradle
geopossachs Oct 8, 2023
661ec6a
Merge branch 'V1.6.0' into feature/jakarta-10
geopossachs Oct 20, 2023
98d7753
Merge branch 'feature/build-with-drone' into feature/jakarta-10
geopossachs Oct 20, 2023
5d3b6e3
update the version of patternfly
geopossachs Oct 20, 2023
9e89dc4
build with jdk11
geopossachs Oct 20, 2023
483aaf5
build with jdk11
geopossachs Oct 20, 2023
08fa5b0
test snapshot push to gitlab via ci
geopossachs Oct 20, 2023
b3a031d
test snapshot push to gitlab via ci
geopossachs Oct 20, 2023
ed19766
test snapshot push to gitlab via ci
geopossachs Oct 20, 2023
dfee769
test snapshot push to gitlab via ci
geopossachs Oct 20, 2023
4ef1578
test snapshot push to gitlab via ci
geopossachs Oct 20, 2023
73c9acb
test snapshot push to gitlab via ci
geopossachs Oct 20, 2023
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
47 changes: 47 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions .drone_maven_settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">

<servers>
<server>
<id>github</id>
<username>${env.GITHUB_USERNAME}</username>
<password>${env.GITHUB_ACCESS_TOKEN}</password>
</server>
</servers>

</settings>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
1 change: 0 additions & 1 deletion gradleResources/Bootstrap/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
36 changes: 30 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
<maven.build.timestamp.format>yyyyMMdd-HH:mm:ss</maven.build.timestamp.format>

<!-- compiler plugin configuation -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.debug>true</maven.compiler.debug>
<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
</properties>
Expand Down Expand Up @@ -97,8 +97,11 @@
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->

<!--
This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself.
-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Expand All @@ -124,7 +127,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down Expand Up @@ -195,7 +198,7 @@
</build>

<!-- PROFILES SECTION -->
<profiles>
<profiles>
<profile>
<id>Mojarra2.2.12</id>
<activation>
Expand Down Expand Up @@ -283,6 +286,27 @@
</plugins>
</build>
</profile>

<profile>
<id>geopossachs</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<distributionManagement>
<snapshotRepository>
<id>github</id>
<name>GitHub Apache Maven Packages</name>
<url>https://maven.pkg.github.com/geopossachs/BootsFaces-OSP</url>
</snapshotRepository>
<!--
<repository>
<id>github</id>
<name>GitHub Apache Maven Packages</name>
<url>https://maven.pkg.github.com/geopossachs/BootsFaces-OSP</url>
</repository>
-->
</distributionManagement>
</profile>
</profiles>

<distributionManagement>
Expand Down
18 changes: 9 additions & 9 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'