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.

Sign up for GitHub

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

Use latest stable dependencies and update copyright year #702

Closed
wants to merge 4 commits into from
Closed

Use latest stable dependencies and update copyright year #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1387e8
upgrade testng dependency to version 7.8.0
bmscomp Nov 24, 2023
e2951c7
update copyrithy year
bmscomp Nov 25, 2023
828bf4d
update some dependencies
bmscomp Nov 25, 2023
569cb10
restore the order of equals
bmscomp Nov 27, 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
6 changes: 4 additions & 2 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
<atinject.api.version>2.0.1</atinject.api.version>
<uel.api.version>5.0.0</uel.api.version>
<interceptor.api.version>2.1.0</interceptor.api.version>
<testng.version>7.8.0</testng.version>
</properties>

<!-- Configure all dependencies (e.g. testing) -->
Expand All @@ -137,7 +138,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
<version>${testng.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -379,9 +380,10 @@
<windowtitle>Jakarta Contexts and Dependency Injection API</windowtitle>
<header><![CDATA[<br>Jakarta Contexts and Dependency Injection ${project.version}]]>
</header>
<!--suppress UnresolvedMavenProperty -->
<bottom><![CDATA[
Comments to: <a href="mailto:cdi-dev@eclipse.org">cdi-dev@eclipse.org</a>.<br>
Copyright &#169; 2018,2022 Eclipse Foundation.<br>
Copyright &#169; 2018,2023 Eclipse Foundation.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
</configuration>
Expand Down
5 changes: 2 additions & 3 deletions api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.jboss.cdi.api.test;

import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.BeforeDestroyed;
Expand Down Expand Up @@ -77,8 +76,8 @@ public void testNonbindingLiteral() {

@Test
public void testTypedLiteral() {
assertTrue(Typed.Literal.INSTANCE.value().length == 0);
assertTrue(Typed.Literal.of(new Class[] { String.class }).value()[0] == String.class);
assertEquals(Typed.Literal.INSTANCE.value().length, 0);
assertEquals(Typed.Literal.of(new Class[] { String.class }).value()[0], String.class);
}

@SuppressWarnings("serial")
Expand Down
10 changes: 5 additions & 5 deletions api/src/test/java/org/jboss/cdi/api/test/CDITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void setUp() throws Exception {
}

@Test(expectedExceptions = IllegalStateException.class)
public void testWithoutServiceFile() throws Exception {
public void testWithoutServiceFile() throws IllegalStateException {
CDI.current();
}

Expand Down Expand Up @@ -96,7 +96,7 @@ public void testWithTwoGoodCDIProvider() throws Exception {
fw.write('\n');
fw.write(DummyCDIProvider.class.getName());
fw.close();
Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
Assert.assertEquals(CDI.current().getClass(), DummyCDIProvider.DummyCDI.class);
}


Expand All @@ -107,7 +107,7 @@ public void testWithTwoGoodCDIProviderReverse() throws Exception {
fw.write('\n');
fw.write(DummyCDIProvider2.class.getName());
fw.close();
Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
Assert.assertEquals(CDI.current().getClass(), DummyCDIProvider.DummyCDI.class);
}

@Test
Expand All @@ -117,7 +117,7 @@ public void testWithTwoCDIProviderOneWithNullCDIAndOneGood() throws Exception {
fw.write('\n');
fw.write(DummyCDIProvider2.class.getName());
fw.close();
Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider2.DummyCDI2.class));
Assert.assertEquals(CDI.current().getClass(), DummyCDIProvider2.DummyCDI2.class);
}


Expand All @@ -130,7 +130,7 @@ public void testWithThreeCDIProviderOneWithNullCDIAndOthersGood() throws Excepti
fw.write('\n');
fw.write(DummyCDIProvider.class.getName());
fw.close();
Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
Assert.assertEquals(CDI.current().getClass(), DummyCDIProvider.DummyCDI.class);
}


Expand Down
18 changes: 11 additions & 7 deletions spec/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@
<description>CDI Specification documentation</description>

<properties>
<asciidoctor-maven.version>2.2.1</asciidoctor-maven.version>
<asciidoctorj.version>2.5.2</asciidoctorj.version>
<asciidoctorj-pdf.version>1.6.0</asciidoctorj-pdf.version>
<asciidoctor-maven.version>2.2.4</asciidoctor-maven.version>
<asciidoctorj.version>2.5.10</asciidoctorj.version>
<asciidoctorj-pdf.version>2.3.9</asciidoctorj-pdf.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<tck-spec-mapper.version>1.0.0.Alpha2</tck-spec-mapper.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<!-- asl2 for non-final releases, or final for EFSL -->
<license-file>asl2</license-file>
<!-- Draft for non-final releases, or Final for spec release -->
Expand Down Expand Up @@ -79,15 +83,15 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>tck-spec-mapper</artifactId>
<version>1.0.0.Alpha2</version>
<version>${tck-spec-mapper.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>${maven-resources-plugin.version}</version>
<executions>
<execution>
<id>copy-resources</id>
Expand All @@ -109,7 +113,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -208,7 +212,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<version>${maven-deploy-plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down