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.

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

[OPENJPA-2762] Update JMS spec to v2.0 and set scope to 'provided' #37

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion openjpa-kernel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
<version>1.0-alpha-2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
6 changes: 6 additions & 0 deletions openjpa-persistence-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@
<artifactId>commons-collections4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
<version>1.0-alpha-2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta-regexp</groupId>
<artifactId>jakarta-regexp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openjpa-project/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The OpenJPA binary assembly and openjpa-all includes software developed by the:
Apache Commons Pool project
Apache Derby project
Apache Geronimo project
Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
Java EE Specs - JMS 2.0, JTA 1.1, Bean Validation 1.0 and JPA 2.0
Apache Incubtor - Bean Validation project
SERP project

Expand Down
2 changes: 1 addition & 1 deletion openjpa-project/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@

<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_2.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</include>
<include>org.apache.xbean:xbean-asm7-shaded</include>
Expand Down
2 changes: 1 addition & 1 deletion openjpa-project/bin-assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_2.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</include>
<include>org.apache.xbean:xbean-asm7-shaded</include>
Expand Down
2 changes: 1 addition & 1 deletion openjpa-project/src/doc/manual/openjpa_legal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ The openjpa-all aggregate JAR includes software developed by the:
Apache Commons Pool project
</para></listitem>
<listitem><para>
Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 2.0 spec APIs)
Apache Geronimo project (JMS 2.0, JTA 1.1 and JPA 2.0 spec APIs)
</para></listitem>
<listitem><para>
JCP JSR-317 JPA 2.0 schemas
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1519,8 +1519,9 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.1.1</version>
<artifactId>geronimo-jms_2.0_spec</artifactId>
<version>1.0-alpha-2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down