Skip to content

Commit

Permalink
Merge pull request #287 from cesarhernandezgt/tomee-7.1.x-TT.x-patch
Browse files Browse the repository at this point in the history
Update jose4j 0.9.6 and tomcat 8.5.99
  • Loading branch information
cesarhernandezgt authored Apr 1, 2024
2 parents 556a425 + 287b215 commit 40d81ac
Show file tree
Hide file tree
Showing 283 changed files with 625 additions and 620 deletions.
2 changes: 1 addition & 1 deletion arquillian/arquillian-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-common</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions arquillian/arquillian-openejb-embedded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>arquillian-openejb-embedded</artifactId>
<name>OpenEJB :: Arquillian Adaptors Parent :: OpenEJB Container</name>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion arquillian/arquillian-openejb-transaction-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion arquillian/arquillian-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-tck</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions arquillian/arquillian-tomee-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>
<artifactId>arquillian-tomee-common</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -86,7 +86,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-jee</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion arquillian/arquillian-tomee-embedded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>
<artifactId>arquillian-tomee-embedded</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion arquillian/arquillian-tomee-moviefun-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>
<artifactId>arquillian-tomee-moviefun-example</artifactId>
<packaging>war</packaging>
Expand Down
8 changes: 4 additions & 4 deletions arquillian/arquillian-tomee-remote/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>
<artifactId>arquillian-tomee-remote</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -91,7 +91,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
<classifier>webprofile</classifier>
<scope>provided</scope>
</dependency>
Expand Down Expand Up @@ -120,7 +120,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>arquillian-tomee-common</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand All @@ -147,7 +147,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>arquillian-common</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-tomee-codi-tests</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-tomee-config-tests</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-tomee-jaxrs-tests</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-tomee-jaxws-tests</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-tomee-jms-tests</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-tomee-webprofile-tests</artifactId>
Expand Down
32 changes: 16 additions & 16 deletions arquillian/arquillian-tomee-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian-tomee-tests</artifactId>
Expand Down Expand Up @@ -219,7 +219,7 @@
<skip>${maven.test.skip}</skip>
<argLine>-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar</argLine>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<arquillian.launch>tomee-embedded</arquillian.launch>
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
</systemPropertyVariables>
Expand Down Expand Up @@ -318,7 +318,7 @@
<skip>${skip.remote.webprofile}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.classifier>webprofile</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
Expand Down Expand Up @@ -352,7 +352,7 @@
<skip>${skip.embedded}</skip>
<argLine>-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=768M</argLine>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<arquillian.launch>tomee-embedded</arquillian.launch>
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
</systemPropertyVariables>
Expand All @@ -368,7 +368,7 @@
<skip>${skip.remote.plume}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.classifier>plume</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
Expand All @@ -388,7 +388,7 @@
<skip>${skip.remote.plus}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.classifier>plus</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
Expand All @@ -404,7 +404,7 @@
<configuration>
<skip>${skip.webapp.webprofile}</skip>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
Expand All @@ -421,7 +421,7 @@
<configuration>
<skip>${skip.webapp.plus}</skip>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
Expand All @@ -438,7 +438,7 @@
<configuration>
<skip>${skip.webapp.plume}</skip>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
Expand Down Expand Up @@ -548,7 +548,7 @@
<skip>${maven.test.skip}</skip>
<argLine>-XX:MaxPermSize=768M</argLine>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<arquillian.launch>tomee-embedded</arquillian.launch>
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
</systemPropertyVariables>
Expand All @@ -567,7 +567,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.classifier>webprofile</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
Expand All @@ -584,7 +584,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.classifier>plus</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
Expand All @@ -601,7 +601,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.classifier>plume</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
Expand All @@ -623,7 +623,7 @@
<configuration>
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
Expand All @@ -640,7 +640,7 @@
<configuration>
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
Expand All @@ -657,7 +657,7 @@
<configuration>
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<tomee.version>7.1.5-TT.24</tomee.version>
<tomee.version>7.1.5-TT.25</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
Expand Down
2 changes: 1 addition & 1 deletion arquillian/arquillian-tomee-webapp-remote/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>
<artifactId>arquillian-tomee-webapp-remote</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions arquillian/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<parent>
<artifactId>tomee-project</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>arquillian</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
<packaging>pom</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent</name>

Expand Down
4 changes: 2 additions & 2 deletions arquillian/ziplock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>
<artifactId>ziplock</artifactId>
<packaging>jar</packaging>
Expand All @@ -45,7 +45,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-jee</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
2 changes: 1 addition & 1 deletion assembly/openejb-lite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>assembly</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>openejb-lite</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions assembly/openejb-standalone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>assembly</artifactId>
<groupId>org.apache.tomee</groupId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</parent>

<artifactId>openejb-standalone</artifactId>
Expand Down Expand Up @@ -124,7 +124,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down Expand Up @@ -202,7 +202,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -222,7 +222,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>7.1.5-TT.24</version>
<version>7.1.5-TT.25</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
Loading

0 comments on commit 40d81ac

Please sign in to comment.