Skip to content

Commit

Permalink
ISPN-14735 Default to JakartaEE packages
Browse files Browse the repository at this point in the history 
- ISPN-14745 Narayana 6.0.0.Final

- ISPN-14746 Fabric8 kubernetes-client 6.5.1

- ISPN-14747 jboss-threads 3.5.0.Final

- ISPN-14748 Smallrye Mutiny 2.1.0

- ISPN-14764 Upgrade to plexus-utils 3.5.1

- ISPN-14734 Quarkus 3.0.0.CR2
  • Loading branch information
@ryanemerson
ryanemerson committed Apr 20, 2023
1 parent 951e7af commit 7a35e0a
Show file tree
Hide file tree
Showing 473 changed files with 1,017 additions and 2,306 deletions.
60 changes: 0 additions & 60 deletions build/bom/pom.xml
View file
Expand Up @@ -75,21 +75,11 @@
<artifactId>infinispan-cachestore-jdbc</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc-common</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc-common-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-sql</artifactId>
Expand All @@ -110,31 +100,16 @@
<artifactId>infinispan-cdi-common</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cdi-common-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cdi-embedded</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cdi-embedded-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cdi-remote</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cdi-remote-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-checkstyle</artifactId>
Expand All @@ -150,21 +125,11 @@
<artifactId>infinispan-hotrod</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-hotrod-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-rest</artifactId>
Expand All @@ -190,11 +155,6 @@
<artifactId>infinispan-commons</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-commons-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<!-- TODO should be here? -->
<dependency>
<groupId>org.infinispan</groupId>
Expand All @@ -217,11 +177,6 @@
<artifactId>infinispan-core</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-jboss-marshalling</artifactId>
Expand Down Expand Up @@ -267,11 +222,6 @@
<artifactId>infinispan-query</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-query-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-query-dsl</artifactId>
Expand Down Expand Up @@ -304,11 +254,6 @@
<artifactId>infinispan-server-hotrod</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<!-- TODO should be here? -->
<dependency>
<groupId>org.infinispan</groupId>
Expand Down Expand Up @@ -403,11 +348,6 @@
<artifactId>infinispan-tools</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-tools-jakarta</artifactId>
<version>${version.infinispan}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-anchored-keys</artifactId>
Expand Down
117 changes: 7 additions & 110 deletions build/configuration/pom.xml
View file
Expand Up @@ -124,14 +124,14 @@
<version.ant-nodeps>1.8.1</version.ant-nodeps>
<version.ant-contrib>1.0b3</version.ant-contrib>
<version.antlr3>3.5.2</version.antlr3>
<version.arquillian>1.6.0.Final</version.arquillian>
<version.arquillian>1.7.0.Alpha14</version.arquillian>
<version.blockhound>1.0.6.RELEASE</version.blockhound>
<version.bouncycastle>1.70</version.bouncycastle>
<version.byteman>4.0.9</version.byteman>
<version.caffeine>3.1.1</version.caffeine>
<version.commons.compress>1.21</version.commons.compress>
<version.console>14.0.1.Final</version.console>
<version.fabric8.kubernetes-client>5.12.2</version.fabric8.kubernetes-client>
<version.fabric8.kubernetes-client>6.5.1</version.fabric8.kubernetes-client>
<version.glassfish.jaxb>2.3.1</version.glassfish.jaxb>
<version.glassfish.json>1.1.4</version.glassfish.json>
<version.groovy>2.4.8</version.groovy>
Expand All @@ -151,17 +151,16 @@
<version.jakarta.annotation-api>2.1.1</version.jakarta.annotation-api>
<version.jakarta.json-api>2.0.0</version.jakarta.json-api>
<version.jakarta.json>2.0.0</version.jakarta.json>
<version.jakarta.transaction.legacy>1.3.3</version.jakarta.transaction.legacy>
<version.jakarta.transaction>2.0.1</version.jakarta.transaction>
<version.jakarta.enterprise.cdi>2.0.2</version.jakarta.enterprise.cdi>
<version.jakarta.enterprise.cdi>4.0.1</version.jakarta.enterprise.cdi>
<version.jakarta.persistence>3.1.0</version.jakarta.persistence>
<version.jboss.logging>3.5.0.Final</version.jboss.logging>
<version.jboss.marshalling>2.1.1.Final</version.jboss.marshalling>
<version.jboss.naming>5.0.6.CR1</version.jboss.naming>
<version.jboss.narayana>5.13.1.Final</version.jboss.narayana>
<version.jboss.narayana.javaee>5.13.1.Final</version.jboss.narayana.javaee>
<version.jboss.narayana>6.0.0.Final</version.jboss.narayana>
<version.jboss.security>3.0.6.Final</version.jboss.security>
<version.jboss.shrinkwrap>1.2.6</version.jboss.shrinkwrap>
<version.jboss.shrinkwrap.descriptors>2.0.0</version.jboss.shrinkwrap.descriptors>
<version.jboss.shrinkwrap.resolver>3.1.3</version.jboss.shrinkwrap.resolver>
<version.jcip-annotations>1.0</version.jcip-annotations>
<version.jgroups>5.2.12.Final</version.jgroups>
Expand Down Expand Up @@ -192,6 +191,7 @@
<version.picketbox>5.0.3.Final</version.picketbox>
<version.picketlink>2.5.5.SP12</version.picketlink>
<version.protostream>4.6.2.Final</version.protostream>
<version.quarkus>3.0.0.CR2</version.quarkus>
<version.reactivestreams>1.0.3</version.reactivestreams>
<version.rocksdb>7.1.2</version.rocksdb>
<version.rxjava>3.1.4</version.rxjava>
Expand All @@ -205,7 +205,7 @@
<version.opentelemetry>1.15.0</version.opentelemetry>
<version.opentelemetry.sdk-autoconfigure>1.15.0-alpha</version.opentelemetry.sdk-autoconfigure>

<version.smallrye-mutiny>1.3.1</version.smallrye-mutiny>
<version.smallrye-mutiny>2.1.0</version.smallrye-mutiny>
<!-- Spring 6, Spring Boot 3 versions -->
<version.spring>6.0.7</version.spring>
<version.spring.boot>3.0.5</version.spring.boot>
Expand Down Expand Up @@ -320,109 +320,6 @@
</build>

<profiles>
<profile>
<id>jakarta-transform</id>
<activation>
<file>
<exists>${basedir}/jakarta.txt</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>jakarta-transform</id>
<goals>
<goal>regex-property</goal>
</goals>
<configuration>
<name>original.artifactId</name>
<value>${project.artifactId}</value>
<regex>\-jakarta$</regex>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.transformer</groupId>
<artifactId>transformer-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<rules>
<jakartaDefaults>true</jakartaDefaults>
</rules>
</configuration>
<executions>
<execution>
<id>default-jar</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
<configuration>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>${original.artifactId}</artifactId>
<version>${project.version}</version>
</artifact>
</configuration>
</execution>
<execution>
<id>source-jar</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
<configuration>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>${original.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</artifact>
</configuration>
</execution>
<execution>
<id>test-jar</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
<configuration>
<skip>${transform.tests.skip}</skip>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>${original.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</artifact>
</configuration>
</execution>
<execution>
<id>test-source-jar</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
<configuration>
<skip>${transform.tests.skip}</skip>
<artifact>
<groupId>${project.groupId}</groupId>
<artifactId>${original.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>test-sources</classifier>
</artifact>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>community-release</id>
<activation>
Expand Down
42 changes: 0 additions & 42 deletions cdi/common-jakarta/pom.xml
View file

This file was deleted.

4 changes: 0 additions & 4 deletions cdi/common-jakarta/src/main/java/org/infinispan/cdi/common/package-info.java
View file

This file was deleted.

11 changes: 5 additions & 6 deletions cdi/common/src/main/java/org/infinispan/cdi/common/util/AbstractImmutableBean.java
View file
Expand Up @@ -6,11 +6,11 @@
import java.util.HashSet;
import java.util.Set;

import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import jakarta.enterprise.context.Dependent;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.Default;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.InjectionPoint;

import org.infinispan.cdi.common.util.logging.Log;
import org.infinispan.commons.logging.LogFactory;
Expand Down Expand Up @@ -149,7 +149,6 @@ public boolean isAlternative() {
return alternative;
}

@Override
public boolean isNullable() {
return nullable;
}
Expand Down
14 changes: 7 additions & 7 deletions cdi/common/src/main/java/org/infinispan/cdi/common/util/Annotateds.java
View file
Expand Up @@ -12,13 +12,13 @@
import java.util.List;
import java.util.Set;

import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedCallable;
import javax.enterprise.inject.spi.AnnotatedConstructor;
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedParameter;
import javax.enterprise.inject.spi.AnnotatedType;
import jakarta.enterprise.inject.spi.Annotated;
import jakarta.enterprise.inject.spi.AnnotatedCallable;
import jakarta.enterprise.inject.spi.AnnotatedConstructor;
import jakarta.enterprise.inject.spi.AnnotatedField;
import jakarta.enterprise.inject.spi.AnnotatedMethod;
import jakarta.enterprise.inject.spi.AnnotatedParameter;
import jakarta.enterprise.inject.spi.AnnotatedType;

/**
* <p>
Expand Down

0 comments on commit 7a35e0a

Please sign in to comment.