Skip to content

Commit

Permalink
Snapshots are automatically deployed as part of the Jenkinsfile build
Browse files Browse the repository at this point in the history 
Dependency updates

* Commons IO to 2.13.0
* Flexmark to 0.64.6 (closes #279)
* Selenide to 6.15.0 (closes #281)
* Tika to 2.8.0
* Tomcat to 9.0.76 (closes #275), thanks to dependabot
* Maven plugins: assembly to 3.6.0, dependency to 3.6.0, project-info-reports to 3.4.5, release to 3.0.1, source to 3.3.0, surefire to 3.1.2, war to 3.4.0, cargo-maven3-plugin to 1.10.7 (closes [#280, thanks to dependabot), maven-surefire-junit5-tree-reporter to 1.2.1 (closes #277, thanks to dependabot)
  • Loading branch information
@juanpablo-santos
juanpablo-santos committed Jun 15, 2023
1 parent 04d7511 commit 37c100d
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 40 deletions.
8 changes: 6 additions & 2 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ try {

stage( 'build source' ) {
parallel jdk11Build: {
buildAndSonarWith( buildJdk11 )
buildSonarAndDeployIfSnapshotWith( buildJdk11 )
},
jdk17Build: {
buildWith( buildJdk17 )
Expand Down Expand Up @@ -65,7 +65,7 @@ try {
}
}

def buildAndSonarWith( jdk ) {
def buildSonarAndDeployIfSnapshotWith( jdk ) {
node( 'ubuntu' ) {
stage( jdk ) {
cleanWs()
Expand All @@ -75,6 +75,10 @@ def buildAndSonarWith( jdk ) {
def sonarOptions = "-Dsonar.projectKey=jspwiki-builder -Dsonar.organization=apache -Dsonar.branch.name=${env.BRANCH_NAME} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN"
echo 'Will use SonarQube instance at https://sonarcloud.io'
sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package org.jacoco:jacoco-maven-plugin:report sonar:sonar $sonarOptions -T 1C"
def pom = readMavenPom( file: 'pom.xml' )
if( pom.version.endsWith( '-SNAPSHOT' ) ) {
sh 'mvn deploy'
}
}
}
}
Expand Down
46 changes: 23 additions & 23 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,29 +216,29 @@ commons-codec-1.3.jar LICENSE
commons-collections-4.4.jar LICENSE
commons-fileupload-1.5.jar LICENSE
commons-httpclient-3.1.jar LICENSE
commons-io-2.11.0.jar LICENSE
commons-io-2.13.0.jar LICENSE
commons-lang-3.12.0.jar LICENSE
commons-logging-1.0.4.jar LICENSE
commons-text-1.9.jar LICENSE
ehcache-2.10.9.2.jar LICENSE
flexmark-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-attributes-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-definition-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-footnotes-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-tables-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-toc-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-ast-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-builder-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-collection-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-data-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-dependency-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-format-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-html-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-misc-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-options-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-sequence-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-visitor-0.64.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-attributes-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-definition-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-footnotes-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-tables-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-toc-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-ast-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-builder-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-collection-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-data-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-dependency-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-format-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-html-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-misc-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-options-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-sequence-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-visitor-0.64.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
freshcookies-security-0.60.jar LICENSE
gson-2.10.1 LICENSE
httpclient-4.5.13 LICENSE
Expand Down Expand Up @@ -272,8 +272,8 @@ oro-2.0.8.jar LICENSE
sandler-0.5.jar ./jspwiki-war/src/main/config/doc/LICENSE.sandler
slf4-api-1.7.36.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
xercesImpl-2.10.0.jar LICENSE
tika-core-2.7.0.jar LICENSE
tika-parsers-2.7.0.jar LICENSE
tika-core-2.8.0.jar LICENSE
tika-parsers-2.8.0.jar LICENSE
xml-apis-1.4.01 LICENSE
xmlrpc-2.0.1.jar LICENSE
xpp3-1.1.3.4-RC3 ./jspwiki-war/src/main/config/doc/LICENSE.cc-cod
Expand All @@ -288,7 +288,7 @@ sqltool-2.7.1.jar ./jspwiki-war/src/main/config/doc/LI
jetty-all-9.4.51.v20230217.jar LICENSE
junit-5.9.3 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
mockito-core-5.3.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
selenide-6.14.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
selenide-6.15.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
stripes-1.7.0-async.jar LICENSE
yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui

Expand All @@ -304,7 +304,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI

RESOURCES LICENSE FILE
=============================================================================================================
Apache Tomcat 9.0.75 LICENSE
Apache Tomcat 9.0.76 LICENSE
Font Awesome (CSS & LESS files) ./jspwiki-war/src/main/config/doc/LICENSE.mit
Font Awesome (Fonts) ./jspwiki-war/src/main/config/doc/LICENSE.ofl
SilkIconSet ./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet
Expand Down
30 changes: 15 additions & 15 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>29</version>
<version>30</version>
</parent>

<groupId>org.apache.jspwiki</groupId>
Expand Down Expand Up @@ -50,11 +50,11 @@
<commons-collections.version>4.4</commons-collections.version>
<commons-fileupload.version>1.5</commons-fileupload.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-io.version>2.13.0</commons-io.version>
<commons-lang.version>3.12.0</commons-lang.version>
<commons-text.version>1.10.0</commons-text.version>
<ehcache.version>2.10.9.2</ehcache.version>
<flexmark.version>0.64.4</flexmark.version>
<flexmark.version>0.64.6</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
<gson.version>2.10.1</gson.version>
<hsqldb.version>2.7.1</hsqldb.version>
Expand All @@ -74,37 +74,37 @@
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
<selenide.version>6.14.0</selenide.version>
<selenide.version>6.15.0</selenide.version>
<slf4j.version>1.7.36</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>2.7.0</tika.version>
<tomcat.version>9.0.75</tomcat.version>
<tika.version>2.8.0</tika.version>
<tomcat.version>9.0.76</tomcat.version>
<wro4j.version>1.8.0</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>

<plugin.antrun.version>3.1.0</plugin.antrun.version>
<plugin.assembly.version>3.5.0</plugin.assembly.version>
<plugin.assembly.version>3.6.0</plugin.assembly.version>
<plugin.clean.version>3.2.0</plugin.clean.version>
<plugin.compiler.version>3.11.0</plugin.compiler.version>
<plugin.dependency.version>3.5.0</plugin.dependency.version>
<plugin.dependency.version>3.6.0</plugin.dependency.version>
<plugin.enforcer.version>3.3.0</plugin.enforcer.version>
<plugin.install.version>3.1.1</plugin.install.version>
<plugin.jar.version>3.3.0</plugin.jar.version>
<plugin.javadoc.version>3.5.0</plugin.javadoc.version>
<plugin.jxr.version>3.3.0</plugin.jxr.version>
<plugin.project-info-reports.version>3.4.3</plugin.project-info-reports.version>
<plugin.release.version>3.0.0</plugin.release.version>
<plugin.project-info-reports.version>3.4.5</plugin.project-info-reports.version>
<plugin.release.version>3.0.1</plugin.release.version>
<plugin.remote-resources.version>3.1.0</plugin.remote-resources.version>
<plugin.resources.version>3.3.1</plugin.resources.version>
<plugin.source.version>3.2.1</plugin.source.version>
<plugin.surefire.version>3.1.0</plugin.surefire.version>
<plugin.surefire.junit5-tree-reporter.version>1.1.0</plugin.surefire.junit5-tree-reporter.version>
<plugin.war.version>3.3.2</plugin.war.version>
<plugin.source.version>3.3.0</plugin.source.version>
<plugin.surefire.version>3.1.2</plugin.surefire.version>
<plugin.surefire.junit5-tree-reporter.version>1.2.1</plugin.surefire.junit5-tree-reporter.version>
<plugin.war.version>3.4.0</plugin.war.version>
<plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>
<plugin.jspc.version>3.2.2</plugin.jspc.version>
<plugin.checksum.version>1.11</plugin.checksum.version>
<plugin.jslint.version>1.0.1</plugin.jslint.version>
<plugin.cargo.version>1.10.6</plugin.cargo.version>
<plugin.cargo.version>1.10.7</plugin.cargo.version>
<plugin.clirr.version>2.8</plugin.clirr.version>
<plugin.cobertura.version>2.7</plugin.cobertura.version>
<plugin.sonar.version>3.9.1.2184</plugin.sonar.version>
Expand Down

0 comments on commit 37c100d

Please sign in to comment.