From ff91d3cf1910dc9111cdf8c8362c78ec00e013ce Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Tue, 6 Apr 2021 16:14:31 -0300 Subject: [PATCH 01/15] Conserta o build Conserta o build --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index a98b76035..434dad2f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,12 @@ language: java +jdk: +- oraclejdk8 +- openjdk8 +before_install: + - wget http://apache.mirror.gtcomm.net/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz + - tar xzvf apache-maven-3.6.0-bin.tar.gz + - export PATH=`pwd`/apache-maven-3.6.0/bin:$PATH + - mvn -v +script: +- mvn test verify --batch-mode From 129b9720e6777ca268761d92c7f5f5ba9e5470dd Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Tue, 6 Apr 2021 16:23:00 -0300 Subject: [PATCH 02/15] =?UTF-8?q?Maven=20mirror=20com=20certificado=20inv?= =?UTF-8?q?=C3=A1lido?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maven mirror com certificado inválido --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 434dad2f7..207fc1899 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ jdk: - oraclejdk8 - openjdk8 before_install: - - wget http://apache.mirror.gtcomm.net/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz + - wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.tar.gz - tar xzvf apache-maven-3.6.0-bin.tar.gz - export PATH=`pwd`/apache-maven-3.6.0/bin:$PATH - mvn -v From 136f02996d1be3b70fad0ce7be67631fee0a958b Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Tue, 6 Apr 2021 16:25:42 -0300 Subject: [PATCH 03/15] Somente openjdk Somente openjdk --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 207fc1899..690842fc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,13 @@ language: java jdk: -- oraclejdk8 - openjdk8 + before_install: - wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.tar.gz - tar xzvf apache-maven-3.6.0-bin.tar.gz - export PATH=`pwd`/apache-maven-3.6.0/bin:$PATH - mvn -v + script: - mvn test verify --batch-mode From c6a1f49081d707e79759e94756656aa06c455fbf Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Thu, 2 Sep 2021 16:10:52 -0300 Subject: [PATCH 04/15] ajuste para compilar com jdk11 --- pom.xml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index d170189d3..c566d7543 100644 --- a/pom.xml +++ b/pom.xml @@ -106,15 +106,18 @@ org.apache.maven.plugins maven-compiler-plugin - - 1.6 - 1.6 - UTF-8 - + 3.8.0 + + 11 + 1.8 + 1.8 + true + org.apache.maven.plugins maven-javadoc-plugin + 3.3.0 attach-javadoc @@ -128,8 +131,6 @@ http://java.sun.com/j2se/1.5/docs/api - utf-8 - utf-8 @@ -149,7 +150,7 @@ maven-surefire-plugin - 2.4.2 + 3.0.0-M5 once true @@ -207,7 +208,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.8.0 org.apache.maven.plugins @@ -216,7 +217,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.8 + 3.3.0 org.apache.maven.plugins @@ -454,12 +455,12 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.8 + 3.3.0 org.apache.maven.plugins maven-surefire-plugin - 2.8.1 + 3.0.0-M5 org.codehaus.mojo From 7d51ec35b074851f979010297492ab52f95f9bd6 Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Thu, 2 Sep 2021 16:12:08 -0300 Subject: [PATCH 05/15] ajusta o compilador do jasperreports plugin --- stella-boleto/pom.xml | 346 +++++++++++++++++++++--------------------- 1 file changed, 173 insertions(+), 173 deletions(-) diff --git a/stella-boleto/pom.xml b/stella-boleto/pom.xml index 42e417e79..d7e9692fc 100644 --- a/stella-boleto/pom.xml +++ b/stella-boleto/pom.xml @@ -1,188 +1,188 @@ - 4.0.0 + 4.0.0 - - br.com.caelum.stella - caelum-stella - 2.1.6-SNAPSHOT - + + br.com.caelum.stella + caelum-stella + 2.1.6-SNAPSHOT + - caelum-stella-boleto - jar - Stella Boleto + caelum-stella-boleto + jar + Stella Boleto - - - - br.com.caelum.stella - caelum-stella-core - 2.1.6-SNAPSHOT - + + + + br.com.caelum.stella + caelum-stella-core + 2.1.6-SNAPSHOT + - - net.sf.jasperreports - jasperreports - 5.5.0 - - - jfree - * - - - com.fasterxml.jackson.core - * - - - org.bouncycastle - * - - - bouncycastle - * - - - eclipse - * - - - org.codehaus.castor - * - - - xml-apis - * - - - + + net.sf.jasperreports + jasperreports + 5.5.0 + + + jfree + * + + + com.fasterxml.jackson.core + * + + + org.bouncycastle + * + + + bouncycastle + * + + + eclipse + * + + + org.codehaus.castor + * + + + xml-apis + * + + + - - - net.sourceforge.barbecue - barbecue - 1.5-beta1 - + + + net.sourceforge.barbecue + barbecue + 1.5-beta1 + - - - pdfbox - pdfbox - 0.7.3 - test - + + + pdfbox + pdfbox + 0.7.3 + test + - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - true - - + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + true + + - - - doclint-java8-disable - - [1.8,) - + + + doclint-java8-disable + + [1.8,) + - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + + + - - - - - net.sourceforge.maven-taglib - maven-taglib-plugin - 2.4 - - - - taglibdocjar - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - jasperreports-maven-plugin - [1.0-beta-2,) - - compile-reports - - - - - - - - - - - - + + + + + net.sourceforge.maven-taglib + maven-taglib-plugin + 2.4 + + + + taglibdocjar + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + jasperreports-maven-plugin + [1.0-beta-2,) + + compile-reports + + + + + + + + + + + + - - - net.sourceforge.maven-taglib - maven-taglib-plugin - 2.4 - + + + net.sourceforge.maven-taglib + maven-taglib-plugin + 2.4 + - - org.codehaus.mojo - jasperreports-maven-plugin - 1.0-beta-2 - - src/main/resources - 1.6 - 1.6 - net.sf.jasperreports.engine.design.JRJdtCompiler - - - - net.sf.jasperreports - jasperreports - 5.5.0 - - - org.mortbay.jetty - servlet-api - 3.0.20100224 - - - - - compile - - compile-reports - - - - - - + + org.codehaus.mojo + jasperreports-maven-plugin + 1.0-beta-2 + + src/main/resources + 1.8 + 1.8 + net.sf.jasperreports.engine.design.JRJdtCompiler + + + + net.sf.jasperreports + jasperreports + 6.1.0 + + + org.mortbay.jetty + servlet-api + 3.0.20100224 + + + + + compile + + compile-reports + + + + + + From 814ca7bf1de7a210c2d94e0ee22b5d18de5be969 Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Thu, 2 Sep 2021 16:19:24 -0300 Subject: [PATCH 06/15] configura o build para jdk11 --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 690842fc4..19a7db04b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,12 @@ language: java jdk: - openjdk8 +- openjdk11 before_install: - - wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.tar.gz - - tar xzvf apache-maven-3.6.0-bin.tar.gz - - export PATH=`pwd`/apache-maven-3.6.0/bin:$PATH + - wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz + - tar xzvf apache-maven-3.6.3-bin.tar.gz + - export PATH=`pwd`/apache-maven-3.6.3/bin:$PATH - mvn -v script: From ad204bf8e900289b4a19702c0c8a9e91f2d9938a Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Thu, 2 Sep 2021 17:20:55 -0300 Subject: [PATCH 07/15] jasperreporsts 6.1.0 --- stella-boleto/pom.xml | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/stella-boleto/pom.xml b/stella-boleto/pom.xml index d7e9692fc..3f5259d37 100644 --- a/stella-boleto/pom.xml +++ b/stella-boleto/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 + 4.0.0 br.com.caelum.stella @@ -22,37 +22,21 @@ net.sf.jasperreports jasperreports - 5.5.0 + 6.1.0 - jfree - * - - - com.fasterxml.jackson.core - * - - - org.bouncycastle - * + xml-apis + xml-apis - bouncycastle + org.glassfish.jersey.media * - eclipse + com.fasterxml.jackson.core * - - org.codehaus.castor - * - - - xml-apis - * - - + From 68be002dc4517c03b9a6094232e1fac5fd4b09ad Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Thu, 2 Sep 2021 17:21:41 -0300 Subject: [PATCH 08/15] maven-compiler 3.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c566d7543..762bfd7ef 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 11 1.8 From 96299645d66467e760aad305d9a44f2037ecdfe8 Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Thu, 2 Sep 2021 17:24:29 -0300 Subject: [PATCH 09/15] maven 3.8.2 e desabilita bloqueio do uso HTTP --- .mvn/custom-settings.xml | 12 ++++++++++++ .mvn/maven.config | 1 + .travis.yml | 7 +++---- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 .mvn/custom-settings.xml create mode 100644 .mvn/maven.config diff --git a/.mvn/custom-settings.xml b/.mvn/custom-settings.xml new file mode 100644 index 000000000..ef2e146e9 --- /dev/null +++ b/.mvn/custom-settings.xml @@ -0,0 +1,12 @@ + + + + jaspersoft-third-party-mirror + jaspersoft-third-party + http://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/ + false + + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 000000000..3cdee9341 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +--settings ./.mvn/custom-settings.xml diff --git a/.travis.yml b/.travis.yml index 19a7db04b..f0f34290e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,12 @@ language: java jdk: -- openjdk8 - openjdk11 before_install: - - wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz - - tar xzvf apache-maven-3.6.3-bin.tar.gz - - export PATH=`pwd`/apache-maven-3.6.3/bin:$PATH + - wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.tar.gz + - tar xzvf apache-maven-3.8.2-bin.tar.gz + - export PATH=`pwd`/apache-maven-3.8.2/bin:$PATH - mvn -v script: From efb63eb1f4aee6e3922ea448ca7413cedb5c243e Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Mon, 13 Sep 2021 17:00:00 -0300 Subject: [PATCH 10/15] Conserta java.lang.NoClassDefFoundError: javax/xml/bind/JAXBException --- pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pom.xml b/pom.xml index 762bfd7ef..4633683c6 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,18 @@ 1.8.5 test + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + @@ -94,6 +106,14 @@ mockito-all 1.8.5 + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.glassfish.jaxb + jaxb-runtime + From 821fc7735a35712cd4f97d879ac8d36c75d80dc3 Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Mon, 13 Sep 2021 17:00:38 -0300 Subject: [PATCH 11/15] Conserta java.lang.NoClassDefFoundError: com/fasterxml/jackson/databind/JsonNode --- stella-boleto/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stella-boleto/pom.xml b/stella-boleto/pom.xml index 3f5259d37..5cebf512c 100644 --- a/stella-boleto/pom.xml +++ b/stella-boleto/pom.xml @@ -32,10 +32,6 @@ org.glassfish.jersey.media * - - com.fasterxml.jackson.core - * - From 2afd09debc55c358734c2ded49d18f00f8daeb33 Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Mon, 13 Sep 2021 17:23:44 -0300 Subject: [PATCH 12/15] =?UTF-8?q?ajuste=20pois=20o=20Travis=20est=C3=A1=20?= =?UTF-8?q?com=20uma=20vers=C3=A3o=20openjdk11=20antiga?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 4633683c6..25a6f2096 100644 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,7 @@ jar + 8 http://java.sun.com/j2se/1.5/docs/api From 1370c2768e5cb142fcf8a3fe068e446affee631f Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Mon, 11 Oct 2021 12:29:12 -0300 Subject: [PATCH 13/15] =?UTF-8?q?incorpora=20a=20sugest=C3=A3o=20feita=20n?= =?UTF-8?q?o=20PR=20#275?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index f0f34290e..4fce12997 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,3 +11,7 @@ before_install: script: - mvn test verify --batch-mode + +cache: + directories: + - $HOME/.m2 From 5bd1f4e54ffa979b900fa9517d8e987c8a548c42 Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Mon, 25 Oct 2021 10:51:59 -0300 Subject: [PATCH 14/15] Rervert parcialmente o o commit "desabilita bloqueio do uso HTTP" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit O projeto jasperreports mantido pelo JasperSoft disponibilizou um repositório com HTTPS --- .mvn/custom-settings.xml | 12 ------------ .mvn/maven.config | 1 - stella-boleto/pom.xml | 13 +++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 .mvn/custom-settings.xml delete mode 100644 .mvn/maven.config diff --git a/.mvn/custom-settings.xml b/.mvn/custom-settings.xml deleted file mode 100644 index ef2e146e9..000000000 --- a/.mvn/custom-settings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - jaspersoft-third-party-mirror - jaspersoft-third-party - http://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/ - false - - - diff --git a/.mvn/maven.config b/.mvn/maven.config deleted file mode 100644 index 3cdee9341..000000000 --- a/.mvn/maven.config +++ /dev/null @@ -1 +0,0 @@ ---settings ./.mvn/custom-settings.xml diff --git a/stella-boleto/pom.xml b/stella-boleto/pom.xml index 5cebf512c..859e11995 100644 --- a/stella-boleto/pom.xml +++ b/stella-boleto/pom.xml @@ -164,5 +164,18 @@ + + + jaspersoft-third-party + https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/ + + + + + + jaspersoft-third-party + https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/ + + From d077d9d90a7a8f0a1908c5bc32a8cace48b37385 Mon Sep 17 00:00:00 2001 From: Gilberto Caetano de Andrade Date: Fri, 18 Oct 2024 09:11:04 -0300 Subject: [PATCH 15/15] substitui travis por github workflow --- .github/workflows/ci.yml | 24 ++++++++++++++++++++++++ .github/workflows/pr-validation.yml | 24 ++++++++++++++++++++++++ .travis.yml | 17 ----------------- pom.xml | 1 - 4 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/pr-validation.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..6e2a49edf --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,24 @@ +name: Java CI +on: [push] +env: + MAVEN_OPTS: -Dmaven.artifact.threads=256 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup Java JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 11 + - name: 'Cache Maven packages' + uses: actions/cache@v4 + with: + path: ~/.m2 + key: 'cache' + restore-keys: 'cache' + - name: 'Build with Maven' + run: mvn -B install --file pom.xml + - name: 'Remove Snapshots Before Caching' + run: find ~/.m2 -name '*SNAPSHOT' | xargs rm -Rf diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml new file mode 100644 index 000000000..7988e7a0d --- /dev/null +++ b/.github/workflows/pr-validation.yml @@ -0,0 +1,24 @@ +name: Pull Request +on: [pull_request] +env: + MAVEN_OPTS: -Dmaven.artifact.threads=256 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup Java JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 11 + - name: 'Cache Maven packages' + uses: actions/cache@v4 + with: + path: ~/.m2 + key: 'cache' + restore-keys: 'cache' + - name: 'Build with Maven' + run: mvn -B install --file pom.xml + - name: 'Remove Snapshots Before Caching' + run: find ~/.m2 -name '*SNAPSHOT' | xargs rm -Rf diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4fce12997..000000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -language: java - -jdk: -- openjdk11 - -before_install: - - wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.tar.gz - - tar xzvf apache-maven-3.8.2-bin.tar.gz - - export PATH=`pwd`/apache-maven-3.8.2/bin:$PATH - - mvn -v - -script: -- mvn test verify --batch-mode - -cache: - directories: - - $HOME/.m2 diff --git a/pom.xml b/pom.xml index 497beacc6..a2c84251f 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,6 @@ jar - 8 http://java.sun.com/j2se/1.5/docs/api