Skip to content

Commit

Permalink
Merge branch 'master' into eeint
Browse files Browse the repository at this point in the history
  • Loading branch information
starksm64 authored Feb 26, 2024
2 parents 73b4ca6 + b62f7d5 commit ea44254
Show file tree
Hide file tree
Showing 3,783 changed files with 19,010 additions and 17,839 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/workflows/ci-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
java-version: ${{ matrix.java }}
- name: "Maven install(staging)"
run: |
mvn clean install -Pstaging -B -V
mvn clean install -Dno-format -Pstaging -B -V
- name: "Maven install"
run: |
mvn clean install -B -V javadoc:javadoc
mvn clean install -Dno-format -B -V javadoc:javadoc
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ target
.settings
.classpath
.idea
.cache
*.iml

test-output
6 changes: 3 additions & 3 deletions CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ cdi-tck - Project repository hosted on GitHub.
`clone: https://github.com/jakartaee/cdi-tck.git`

injection-api - Project repository hosted on GitHub.
`clone: https://github.com/jakartaee/injection-api.git`
`clone: https://github.com/jakartaee/inject.git`

injection-spec - Project repository hosted on GitHub.
`clone: https://github.com/jakartaee/injection-spec.git`
`clone: https://github.com/jakartaee/inject-spec.git`

injection-tck - Project repository hosted on GitHub.
`clone: https://github.com/jakartaee/injection-tck.git`
`clone: https://github.com/jakartaee/inject-tck.git`

=== Legacy CPL Licensed CDI Respositories
cdi-tck-cpl - Project repository hosted on GitHub.
Expand Down
10 changes: 5 additions & 5 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ The project maintains the following source code repositories:

* https://github.com/jakartaee/cdi
* https://github.com/jakartaee/cdi-tck
* https://github.com/jakartaee/injection-api
* https://github.com/jakartaee/injection-spec
* https://github.com/jakartaee/injection-tck
* https://github.com/jakartaee/inject
* https://github.com/jakartaee/inject-spec
* https://github.com/jakartaee/inject-tck

The project also maintains the following legacy CPL licensed source code repositories:

* https://github.com/eclipse-ee4j/cdi-cpl.git
* https://github.com/eclipse-ee4j/cdi-tck-cpl.git
* https://github.com/eclipse-ee4j/cdi-cpl
* https://github.com/eclipse-ee4j/cdi-tck-cpl

## Third-party Content

Expand Down
9 changes: 6 additions & 3 deletions api/src/main/java/org/jboss/cdi/tck/api/Configuration.java
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ public interface Configuration {
public void setEl(EL el);

/**
* The TCK allows additional libraries to be put in the deployed test artifacts (for example the porting package for the implementation). Any jars in this
* The TCK allows additional libraries to be put in the deployed test artifacts (for example the porting package for the
* implementation). Any jars in this
* directory will be added to the deployed artifact.
*
* By default no directory is used.
Expand All @@ -116,7 +117,8 @@ public interface Configuration {
public void setLibraryDirectory(String libraryDir);

/**
* Few TCK tests need to work with Java EE services related to persistence (JPA, JTA) - test datasource must be provided. These tests belong to testng group
* Few TCK tests need to work with Java EE services related to persistence (JPA, JTA) - test datasource must be provided.
* These tests belong to testng group
* <code>persistence</code>.
*
* @return the JNDI name of the test datasource
Expand Down Expand Up @@ -163,7 +165,8 @@ public interface Configuration {
public void setTestJmsTopic(String testJmsTopic);

/**
* All tests using some timeout technique (e.g. wait for async processing) should use this value to adjust the final timeout so that it's possible to configure timeouts
* All tests using some timeout technique (e.g. wait for async processing) should use this value to adjust the final timeout
* so that it's possible to configure timeouts
* according to the testing runtime performance and throughput.
*
* @return the test timeout factor (in percent)
Expand Down
116 changes: 58 additions & 58 deletions api/src/main/java/org/jboss/cdi/tck/spi/Beans.java
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
/*
* Copyright 2010, Red Hat, Inc., and individual contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.cdi.tck.spi;

import java.io.IOException;

/**
* Provides Bean related operations.
*
* The TCK porting package must provide an implementation of this interface which is suitable for the target implementation.
*
* This interface may be removed.
*
* @author Shane Bryzak
* @author Pete Muir
* @author David Allen
*
*/
public interface Beans {

public static final String PROPERTY_NAME = Beans.class.getName();

/**
* Determines if the object instance is actually a proxy object.
*
* @param instance The object which might be a proxy
* @return true if the object is a proxy
*/
public boolean isProxy(Object instance);

/**
* Passivates the object tree starting with the bean instance provided.
*
* @param instance The bean instance to serialize
* @return the serialized byte array of the bean instance
*/
public byte[] passivate(Object instance) throws IOException;

/**
* Activates a bean instance from the given serialized bytes.
*
* @param bytes The serialized byte stream of a bean instance
* @return the serialized byte array of the bean instance
*/
public Object activate(byte[] bytes) throws IOException, ClassNotFoundException;

}
/*
* Copyright 2010, Red Hat, Inc., and individual contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.cdi.tck.spi;

import java.io.IOException;

/**
* Provides Bean related operations.
*
* The TCK porting package must provide an implementation of this interface which is suitable for the target implementation.
*
* This interface may be removed.
*
* @author Shane Bryzak
* @author Pete Muir
* @author David Allen
*
*/
public interface Beans {

public static final String PROPERTY_NAME = Beans.class.getName();

/**
* Determines if the object instance is actually a proxy object.
*
* @param instance The object which might be a proxy
* @return true if the object is a proxy
*/
public boolean isProxy(Object instance);

/**
* Passivates the object tree starting with the bean instance provided.
*
* @param instance The bean instance to serialize
* @return the serialized byte array of the bean instance
*/
public byte[] passivate(Object instance) throws IOException;

/**
* Activates a bean instance from the given serialized bytes.
*
* @param bytes The serialized byte stream of a bean instance
* @return the serialized byte array of the bean instance
*/
public Object activate(byte[] bytes) throws IOException, ClassNotFoundException;

}
148 changes: 74 additions & 74 deletions api/src/main/java/org/jboss/cdi/tck/spi/Contexts.java
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
/*
* Copyright 2010, Red Hat, Inc., and individual contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.cdi.tck.spi;

import jakarta.enterprise.context.spi.Context;

/**
* This interface provides operations relating to Contexts.
*
* The TCK porting package must provide an implementation of this interface which is suitable for the target implementation.
*
* @author Shane Bryzak
* @author Pete Muir
*
* @param <T> The concrete context type of the implementation
*
*/
public interface Contexts<T extends Context> {

public static final String PROPERTY_NAME = Contexts.class.getName();

/**
* Sets the specified context as active.
* <p>
* The set of existing contextual instances of the context is preserved
* across invocations of {@link #setActive(Context)} and {@link #setInactive(Context)}.
*
* @param context The context to set active
*/
public void setActive(T context);

/**
* Sets the specified context as inactive.
* <p>
* The set of existing contextual instances of the context is preserved
* across invocations of {@link #setActive(Context)} and {@link #setInactive(Context)}.
*
* @param context The context to set inactive
*/
public void setInactive(T context);

/**
* Get the request context, regardless of whether it is active or not
*
* @return The request context
*/
public T getRequestContext();

/**
* Returns the dependent context, regardless of whether it is active or not
*
* @return the dependent context
*/
public T getDependentContext();

/**
* Destroy the context. This operation is defined by the CDI specification but has no API.
*
* @param context the context to destroy
*/
public void destroyContext(T context);

}
/*
* Copyright 2010, Red Hat, Inc., and individual contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.cdi.tck.spi;

import jakarta.enterprise.context.spi.Context;

/**
* This interface provides operations relating to Contexts.
*
* The TCK porting package must provide an implementation of this interface which is suitable for the target implementation.
*
* @author Shane Bryzak
* @author Pete Muir
*
* @param <T> The concrete context type of the implementation
*
*/
public interface Contexts<T extends Context> {

public static final String PROPERTY_NAME = Contexts.class.getName();

/**
* Sets the specified context as active.
* <p>
* The set of existing contextual instances of the context is preserved
* across invocations of {@link #setActive(Context)} and {@link #setInactive(Context)}.
*
* @param context The context to set active
*/
public void setActive(T context);

/**
* Sets the specified context as inactive.
* <p>
* The set of existing contextual instances of the context is preserved
* across invocations of {@link #setActive(Context)} and {@link #setInactive(Context)}.
*
* @param context The context to set inactive
*/
public void setInactive(T context);

/**
* Get the request context, regardless of whether it is active or not
*
* @return The request context
*/
public T getRequestContext();

/**
* Returns the dependent context, regardless of whether it is active or not
*
* @return the dependent context
*/
public T getDependentContext();

/**
* Destroy the context. This operation is defined by the CDI specification but has no API.
*
* @param context the context to destroy
*/
public void destroyContext(T context);

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/jboss/cdi/tck/spi/EL.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ public interface EL {
* @param expectedParamTypes
* @return
*/
public <T> T evaluateMethodExpression(BeanManager beanManager, String expression, Class<T> expectedType, Class<?>[] expectedParamTypes,
public <T> T evaluateMethodExpression(BeanManager beanManager, String expression, Class<T> expectedType,
Class<?>[] expectedParamTypes,
Object[] expectedParams);

/**
Expand Down
2 changes: 1 addition & 1 deletion dist-build/lang-model-tck-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<weld.version>6.0.0.Alpha1</weld.version>
<weld.version>6.0.0.Beta1</weld.version>
</properties>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions doc/reference/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@


<properties>
<asciidoctor.maven.plugin.version>2.2.5</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.3.10</asciidoctorj.pdf.version>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.3.13</asciidoctorj.pdf.version>
<pdf.name>cdi-tck-reference-guide.pdf</pdf.name>
<revnumber>4.1</revnumber>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Strict.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
Expand Down
Loading

0 comments on commit ea44254

Please sign in to comment.