Skip to content

Commit

Permalink
Merge remote-tracking branch 'tomitribe/tomee-7.0.x-TT.x-release' int…
Browse files Browse the repository at this point in the history
…o tomee-7.0.x-TT.x-release
  • Loading branch information
jgallimore committed Sep 23, 2021
2 parents 8748a71 + 5898a12 commit 4b15ebe
Show file tree
Hide file tree
Showing 298 changed files with 9,980 additions and 558 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: CI tomee-7.0.x-TT.x-release

on:
push:
branches:
- tomee-7.0.x-TT.x-release
pull_request:
branches:
- tomee-7.0.x-TT.x-release
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Set up Apache Maven Central
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: maven-settings-xml-action
uses: whelk-io/maven-settings-xml-action@v14
with:
repositories: '[{ "id": "tomitribe-all", "name": "tomitribe-all", "url": "https://repository.tomitribe.com/content/groups/tomitribe/", "releases": { "enabled": "true" }, "snapshots": { "enabled": "false" } }]'
plugin_repositories: '[{ "id": "tomitribe-all", "name": "tomitribe-all", "url": "https://repository.tomitribe.com/content/groups/tomitribe/", "releases": { "enabled": "true" }, "snapshots": { "enabled": "false" }}]'
servers: '[{ "id": "tomitribe-all", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}" }]'


- name: maven-settings-xml-cat
run: cat ~/.m2/settings.xml

- name: Build with Maven
run: mvn --show-version -U --fail-at-end clean install -DfailIfNoTests=false -DskipTests
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>arquillian-openejb-embedded</artifactId>
<name>OpenEJB :: Arquillian Adaptors Parent :: OpenEJB Container</name>
<version>7.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</version>
</parent>

<artifactId>arquillian-tck</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion 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.0.8-TT.6</version>
<version>7.0.10-TT.7</version>
</parent>
<artifactId>arquillian-tomee-common</artifactId>
<packaging>jar</packaging>
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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</tomee.version>
<tomee.version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</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.0.8-TT.6</version>
<version>7.0.10-TT.7</version>
</parent>

<artifactId>arquillian</artifactId>
<version>7.0.8-TT.6</version>
<version>7.0.10-TT.7</version>
<packaging>pom</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent</name>

Expand Down
2 changes: 1 addition & 1 deletion 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.0.8-TT.6</version>
<version>7.0.10-TT.7</version>
</parent>
<artifactId>ziplock</artifactId>
<packaging>jar</packaging>
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.0.8-TT.6</version>
<version>7.0.10-TT.7</version>
</parent>

<artifactId>openejb-lite</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion 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.0.8-TT.6</version>
<version>7.0.10-TT.7</version>
</parent>

<artifactId>openejb-standalone</artifactId>
Expand Down
Loading

0 comments on commit 4b15ebe

Please sign in to comment.