Feature/jakarta 10 (#1193)

* add a simple ci pipeline for drone.io * use JKD11 as default like jakarta too
TheCoder4eu · Oct 22, 2023 · 5dce250 · 5dce250
1 parent fba83f5
commit 5dce250
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 18 deletions.
diff --git a/.drone.yml 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
diff --git a/.drone_maven_settings.xml b/.drone_maven_settings.xml
@@ -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>
diff --git 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
@@ -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
@@ -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
@@ -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>
@@ -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>
@@ -124,7 +127,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -195,7 +198,7 @@
 	</build>
 
 	<!-- PROFILES SECTION -->
-	<profiles>
+	<profiles>	
 		<profile>
 			<id>Mojarra2.2.12</id>
 			<activation>
@@ -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>

diff --git 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'