Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TheCoder4eu/BootsFaces-OSP
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.4.1
Choose a base ref
...
head repository: TheCoder4eu/BootsFaces-OSP
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jan 4, 2019

  1. Copy the full SHA
    17f7536 View commit details
  2. Copy the full SHA
    2c0a1e6 View commit details
  3. Copy the full SHA
    e21c0d7 View commit details

Commits on Jan 21, 2019

  1. Copy the full SHA
    ccabe13 View commit details

Commits on Feb 27, 2019

  1. Copy the full SHA
    c2cc65c View commit details
  2. Copy the full SHA
    75ab74a View commit details

Commits on Apr 29, 2019

  1. Copy the full SHA
    d1a7095 View commit details

Commits on May 1, 2019

  1. Copy the full SHA
    7ac39f6 View commit details

Commits on May 11, 2019

  1. Merge pull request #1074 from geopossachs/bugfixes/datapicker

    add space after css class by datepicker
    TheCoder4eu authored May 11, 2019
    Copy the full SHA
    c02089b View commit details

Commits on Jul 31, 2019

  1. upgrade to jQuery 3.4.1

    Fix #1084
    neondlh authored and stephanrauh committed Jul 31, 2019
    Copy the full SHA
    be7c581 View commit details
  2. Fix fixed height for InputText with tags

    This change adds custom CSS stylesheet for InputText with tags enabled.
    
    The CSS rules make tagsinput wrapper's height automatic with minimum
    height by default. Rules also fix editable input's position when
    typeahead is enabled.
    
    Fix #1081
    Phellipe Kelbert authored and stephanrauh committed Jul 31, 2019
    Copy the full SHA
    c1113f6 View commit details
  3. Copy the full SHA
    276b604 View commit details
  4. fixed #1087

    stephanrauh committed Jul 31, 2019
    Copy the full SHA
    fa381de View commit details
  5. Copy the full SHA
    0b04465 View commit details
  6. Copy the full SHA
    90959d8 View commit details

Commits on Aug 1, 2019

  1. Copy the full SHA
    ada6a0f View commit details
  2. Copy the full SHA
    9d86f6f View commit details
  3. Copy the full SHA
    e3b1463 View commit details
  4. Copy the full SHA
    c15e88f View commit details
  5. Copy the full SHA
    2090b15 View commit details
  6. upgrade to jQuery 3.4.1

    Fix #1084
    neondlh authored and stephanrauh committed Aug 1, 2019
    Copy the full SHA
    03b3cae View commit details
  7. Fix fixed height for InputText with tags

    This change adds custom CSS stylesheet for InputText with tags enabled.
    
    The CSS rules make tagsinput wrapper's height automatic with minimum
    height by default. Rules also fix editable input's position when
    typeahead is enabled.
    
    Fix #1081
    Phellipe Kelbert authored and stephanrauh committed Aug 1, 2019
    Copy the full SHA
    90613dd View commit details
  8. Copy the full SHA
    185c8e5 View commit details
  9. fixed #1087

    stephanrauh committed Aug 1, 2019
    Copy the full SHA
    8b4ff7b View commit details
  10. Copy the full SHA
    e912d9d View commit details
  11. Copy the full SHA
    04a095a View commit details
  12. Copy the full SHA
    fbb69dd View commit details
  13. Copy the full SHA
    2e8ef58 View commit details
  14. Add support for itemDisabled for radiobutton

    This update enabled support for
    
    <b:radiobutton>
      <f:selectItems value="#{listOfItems}" var="item" itemDisabled="#{item.disabled}"/>
    </b:radiobutton>
    
    Fix #1072
    doychin authored and stephanrauh committed Aug 1, 2019
    Copy the full SHA
    ea5feb7 View commit details
  15. Copy the full SHA
    791a592 View commit details
  16. removed debug code

    stephanrauh committed Aug 1, 2019
    Copy the full SHA
    9729f9d View commit details
  17. Copy the full SHA
    c363d6c View commit details
  18. Copy the full SHA
    bc2eefa View commit details
  19. Copy the full SHA
    b3b72bf View commit details
  20. Copy the full SHA
    db80a86 View commit details
  21. Copy the full SHA
    45fd5f4 View commit details

Commits on Aug 2, 2019

  1. Fix value submission on InputText with tags

    Tagsinput clones InputText 'input' HTML element and keeps both original
    and newly created elements with 'name' attribute.
    
    This commit removes duplicated 'name' attribute on newly created HTML
    'input' element via inline JavaScript for each InputText component with
    tags enabled.
    
    Fix #1079
    Phellipe Kelbert authored and stephanrauh committed Aug 2, 2019
    Copy the full SHA
    4d9f3ae View commit details

Commits on Aug 3, 2019

  1. Copy the full SHA
    ba53f4e View commit details
  2. fixed #1078

    stephanrauh committed Aug 3, 2019
    Copy the full SHA
    1704117 View commit details
  3. Copy the full SHA
    1ec4b84 View commit details
  4. addressed #865 (and solved it in the case of b:dateTimePicker, but th…

    …ere are several other components to be checked)
    stephanrauh committed Aug 3, 2019
    Copy the full SHA
    f14cf03 View commit details

Commits on Aug 4, 2019

  1. #672 use the same libraries as <b:dateTimePicker>; get rid of momen…

    …t.js (for favor of moment-all-languages.js)
    stephanrauh committed Aug 4, 2019
    Copy the full SHA
    4be04f5 View commit details
  2. Copy the full SHA
    d7b0fdf View commit details
  3. Copy the full SHA
    ab0cdab View commit details

Commits on Aug 5, 2019

  1. Copy the full SHA
    3a67d8a View commit details

Commits on Aug 6, 2019

  1. Merge pull request #1 from TheCoder4eu/master

    copy current stand of snapshot into my repo
    geopossachs authored Aug 6, 2019
    Copy the full SHA
    04c6507 View commit details

Commits on Aug 7, 2019

  1. fixed a bug breaking the multiselect feature in combination with the …

    …checkbox selector feature
    stephanrauh committed Aug 7, 2019
    Copy the full SHA
    cdbcaa0 View commit details
  2. Copy the full SHA
    f50e573 View commit details
  3. typo gremlin

    stephanrauh committed Aug 7, 2019
    Copy the full SHA
    d8cc8a4 View commit details

Commits on Aug 10, 2019

  1. Copy the full SHA
    954d22d View commit details
Showing 456 changed files with 22,186 additions and 10,484 deletions.
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>
37 changes: 37 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: SonarCloud
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'zulu' # Alternative distribution options are available
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Gradle packages
uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: ./gradlew build sonar --info
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -39,4 +39,6 @@ src-gen
/.apt_generated/
/infer-out/
/mavenResources/META-INF/licenses
/doc/
/doc/
.whitesource

14 changes: 14 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"scanSettings": {
"baseBranches": []
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure",
"displayMode": "diff",
"useMendCheckNames": true
},
"issueSettings": {
"minSeverityLevel": "LOW",
"issueType": "DEPENDENCY"
}
}
53 changes: 41 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -16,20 +16,43 @@ To learn more about the framework, take a look at [BootsFaces.net](http://www.b

The source for our page can be found on GitHub. If you want to have a deeper look on how to use the library or found a mistake, visit the [Showcase Project](https://github.com/TheCoder4eu/BootsFacesWeb) or the [Examples Project](https://github.com/TheCoder4eu/BootsFaces-examples).

### Version 2.0.0
Basically, Version 2.0.0 is a considerable number of bug fixes, plus support for JakartaEE. We've dropped support for the old `javax` namespace.

The minimum required version of Java is Java 11.

### State of the project
At the moment, this project is not maintained actively. If you need a feature, please send us a pull request,
so we can build a new version. It's a good idea to reach out to use beforehand, so we can check if (or make sure that) we've got enough time to review your PR and to publish a new version.

### Getting started
To get up and running quickly, have a look at the [Quick Start](http://www.bootsfaces.net/quick-start.jsf).
To get up and running quickly, have a look at the [Quick Start](https://www.bootsfaces.net/quick-start.jsf).

Starting with version 2.0.0, BootsFaces requires JSF 4.0 and JakartaEE. It's no longer compatible to the old JavaEE libraries. Instead, it requires the Jakarta libraries..

### Maven

<dependency>
<groupId>net.bootsfaces</groupId>
<artifactId>bootsfaces</artifactId>
<version>1.4.0</version>
<version>2.0.0</version>
</dependency>

You can also get a version that's compiled to Java 17:

<dependency>
<groupId>net.bootsfaces</groupId>
<artifactId>bootsfaces</artifactId>
<version>2.0.0</version>
<classifier>java17</classifier>
</dependency>

Probably, there's no big difference between the Java 17 build and the Java 11 build. However, in the past,
there is at least one Java version that ran newer builds faster than older builds.

### Gradle

compile 'net.bootsfaces:bootsfaces:1.4.0'
compile 'net.bootsfaces:bootsfaces:2.0.0'

### Development Snapshots

@@ -40,18 +63,24 @@ There's also a [Snapshot Showcase](http://www3.bootsfaces.net/Showcase/) with th
If you want to get your feet wet yourself, we suggest you to take a look at our [cheat-sheet](cheat-sheet.md) and the [contribution guidelines](CONTRIBUTING.md).

### Notes on the new Java Release Cycle
As of March 20, 2018 a new six-month Java release scheme has been adopted and Java 10 is the currently supported rapid release version.
There will be three years between a LTS release and the next and Java 11 will be the next LTS after Java 8(LTS).
Java 10 support ends on the same date that support for Java 11 begins the day of its release, planned for September 25, 2018.
As of March 20, 2018 a new six-month Java release scheme has been adopted.
There will be three years between a LTS release and the next and Java 11 has been the next LTS after Java 8(LTS). Bootsfaces currently supports Java 11 LTS, Java 17 LTS,
and Java 21 LTS. Older versions of Java are not supported.

BootsFaces want to support each Java runtime released after the minimum Java version used to build the library.
However, to prevent too many Java subdirectories in the project root, we created the legacyJava directory, that will collect the build scripts specific for non-LTS runtimes.
This means that our official build will only include non obsolete LTS targets but you will have the option of building for not non-LTS Java targets using commands like follows:
With Gradle, you can build the library using the following Targets:

```
./gradlew :legacyJava:java7:defaultJar
./gradlew :legacyJava:java9:defaultJar
./gradlew :legacyJava:java10:defaultJar
./gradlew :javaBuild:buildJava11Jar
./gradlew :javaBuild:buildJava17Jar
```

### Kudos
Over the years, countless developers helped to make BootsFaces what it is today. We'd like to thank all of them for their contributions.

<table style="border-collapse: collapse; border:none">
<tr style="border:none">
<td style="border:none; width:70%">With respect to version 2.0, we'd like to thank particularly Alexander Hass and his team, who're working for the insurance company "Itzehoer Versicherungen" and who made publishing the new version possible. Without your help, the new version probably wouldn’t exist yet!
<td style="border:none; width:20%"><img src="https://www.itzehoer.de/images/mediathek/itzehoer-logo_farbig_png.png" alt="Logo of the company Itzehoer Versicherungen" style="margin-left: 20px;"></td>
</tr>
</table>

40 changes: 12 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2018 Riccardo Massera (TheCoder4.Eu)
* Copyright 2014-2024 Riccardo Massera (TheCoder4.Eu)
*
* This file is part of BootsFaces.
*
@@ -42,33 +42,27 @@ if(System.getProperty("BSF-THEME", "") != "") {
ext.allThemes= System.getProperty("BSF-THEME", "").replaceAll("\\s","").tokenize(',')
} else {
ext.themes= props['bootswatch.theme'].replaceAll("\\s","").tokenize(',')
ext.allThemes= ('default,patternfly,'+props['bootswatch.theme']).replaceAll("\\s","").tokenize(',')
ext.allThemes= ('default,'+props['bootswatch.theme']).replaceAll("\\s","").tokenize(',')
// Temporarily disable Patternfly Theme inclusion.
//ext.allThemes= ('default,patternfly,'+props['bootswatch.theme']).replaceAll("\\s","").tokenize(',')
println 'Themes('+themes.size+'):'+props['bootswatch.theme']
}

//jQuery options
ext.jqversion = props['jquery.version']
//Java options
//ext.buildJava6 = ( ( props['java6']!=null) && props['java6'].toUpperCase().contains("YES") )
ext.buildJava7 = ( ( props['java7']!=null) && props['java7'].toUpperCase().contains("YES") )
ext.buildJava8 = ( ( props['java8']!=null) && props['java8'].toUpperCase().contains("YES") )
//ext.buildJava9 = ( ( props['java9']!=null) && props['java9'].toUpperCase().contains("YES") )
ext.buildJava10 = ( ( props['java10']!=null) && props['java10'].toUpperCase().contains("YES") )
ext.buildJava11 = ( ( props['java11']!=null) && props['java11'].toUpperCase().contains("YES") )
ext.buildJava17 = ( ( props['java17']!=null) && props['java17'].toUpperCase().contains("YES") )

// Javac Compilation properties
//ext.buildOptsJava6=["-g"]
ext.buildOptsJava7=["-g"]
ext.buildOptsJava=["-g"]
ext.buildOptsJava8=["-g"]
ext.buildOptsJava9=["-g"]
ext.buildOptsJava10=["-g"]
ext.buildOptsJava11=["-g"]
//if( props['java6opts']!=null) { ext.buildOptsJava6 = props['java6opts'].replaceAll("\\s","").tokenize(',') }
if( props['java7opts']!=null) { ext.buildOptsJava7 = props['java7opts'].replaceAll("\\s","").tokenize(',') }
ext.buildOptsJava17=["-g"]
if( props['java8opts']!=null) { ext.buildOptsJava8 = props['java8opts'].replaceAll("\\s","").tokenize(',') }
//if( props['java9opts']!=null) { ext.buildOptsJava9 = props['java9opts'].replaceAll("\\s","").tokenize(',') }
if( props['java10opts']!=null) { ext.buildOptsJava10 = props['java10opts'].replaceAll("\\s","").tokenize(',') }
if( props['java11opts']!=null) { ext.buildOptsJava11 = props['java11opts'].replaceAll("\\s","").tokenize(',') }
if( props['java17opts']!=null) { ext.buildOptsJava17 = props['java17opts'].replaceAll("\\s","").tokenize(',') }
ext.useBootClasspath= ( ( props['enableBootClasspath']!=null) && props['enableBootClasspath'].toUpperCase().contains("YES") )
// Set the Artifact group ID
group = 'net.bootsfaces'
@@ -89,18 +83,9 @@ task showConfig {
println "allThemes="+allThemes
println "jqversion="+jqversion
println "--------Java--------"
//println "buildJava6:"+buildJava6
//println "buildJava7:"+buildJava7
println "buildJava8:"+buildJava8
//println "buildJava9:"+buildJava9
println "buildJava10:"+buildJava10
println "buildJava11:"+buildJava11
//println "buildOptsJava6="+buildOptsJava6
//println "buildOptsJava7="+buildOptsJava7
println "buildOptsJava8="+buildOptsJava8
//println "buildOptsJava9="+buildOptsJava9
println "buildOptsJava10="+buildOptsJava10
println "buildOptsJava11="+buildOptsJava11
println "buildJava17:"+buildJava17
println "buildOptsJava="+buildOptsJava
println "useBootClasspath="+useBootClasspath
println "--------------------"
}
@@ -119,6 +104,5 @@ showConfig.doFirst {
new File( 'pom.xml' ).write( projectPomText, 'UTF-8' )
}

//By default build also the default( plain Bootstrap without Themes ) Jar for Java 8 and 9 only
//defaultTasks 'showConfig', ':java8:defaultJar', ':java9:defaultJar', ':java10:defaultJar', ':java7:jar', ':java6:jar'
defaultTasks 'showConfig', ':java8:defaultJar', ':java11:defaultJar' //, ':java11:defaultJar'
//By default build also the default( plain Bootstrap without Themes ) Jar for Java 8 only
defaultTasks 'showConfig', ':javaBuild:defaultJar',':javaBuild:buildJava11Jar', ':javaBuild:buildJava17Jar' //':java8:defaultJar', ':java11:defaultJar', ':java17:defaultJar' //Java 17 LTS
37 changes: 17 additions & 20 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#################################
# Copyright 2014-2018 Riccardo Massera (TheCoder4.Eu)
# Copyright 2014-2024 Riccardo Massera (TheCoder4.Eu)
#
# This file is part of BootsFaces.
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,24 +24,24 @@
# rather than c:\dir1\dir2 to refer to paths -- Java thinks a single backslash
# is an escape character followed by a control character.
#########################################################################################################
VERSION=1.4.1
VERSION=2.0.1
##VERSION=1.6.0
# RELEASE-STATUS - SNAPSHOT , beta1, RC1 ...
# or don't remove the property but just leave it blank for a Final RELEASE :
# RELEASE-STATUS=
##RELEASE-STATUS=SNAPSHOT
RELEASE-STATUS=
bootstrap.version=3.3.7

bootstrap.version=3.4.1

# Set global properties for this build
bsf.dir=gradleResources
bootstrap.dir=${bsf.dir}/Bootstrap

# jQuery version
# We support jQuery v1, v2 and v3
# v2 and v3 do not support Internet Explorer versions prior to IE 9.
# jQuery 3.x is fully supported only since Bootstrap v3.3.7
# Use the values 1.x, 2.x and 3.x respectively to choose the version.
# IMPORTANT: The 1.x and 2.x branches no longer receive patches, as stated on the official webpage.
# We assume you target recent browsers and set jQuery 3.x as default.
# Since BootsFaces v2.0.0, only jQuery v3 is supported.
# jQuery 3.x is fully supported since Bootstrap v3.3.7
# Please, do not change this value, it will be removed in a future release.
jquery.version=3.x

# Optional Bootswatch configuration
@@ -52,24 +52,21 @@ jquery.version=3.x
# The names of the available Themes are: cerulean,cosmo,cyborg,darkly,flatly,journal,lumen,paper,readable,sandstone,simplex,slate,spacelab,superhero,united,yeti
bootswatch.theme=cerulean,cosmo,cyborg,darkly,flatly,journal,lumen,paper,readable,sandstone,simplex,slate,spacelab,superhero,united,yeti

bootswatch.subversion=
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
# Starting with BootsFaces v1.2.0+ Java 6 will be deprecated.
# Starting with BootsFaces v1.3.0 Java 10 will be preferred over Java 9 (No-LTS release).
# Starting with BootsFaces v1.3.1 Java 11 LTS release will be supported dropping Java 9 and Java 10 (No-LTS releases).
# First LTS Release after Java 8 is Java 11, released september 2018
# Default Build uses Java 8
###java6=NO
java7=NO
java8=YES
java9=No
java10=No
# The LTS Releases after Java 8 are Java 11, released september 2018 and Java 17, released september 2021
# 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
@@ -89,9 +86,9 @@ java11=YES
# Line number debugging information
# vars
# Local variable debugging information
###java6opts=-Xlint:all
#java7opts=-g,-Xlint:unchecked
#java8opts=-g,-Xlint:unchecked
#java8opts=-g:none
java8opts=-Xlint:all

# ADVANCED: Optional bootClasspath compilation (default is No)
#enableBootClasspath=Yes
Loading