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

FISH-6477 OpenMQ 5.1.4.payara-p3 - Do not include LICENSE.md or NOTICE.md (Community Contribution) #20

Merged
Merged
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
2 changes: 1 addition & 1 deletion mq/distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<groupId>org.glassfish.mq</groupId>
<artifactId>mq-distribution</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<name>Message Queue</name>

<url>https://github.com/eclipse-ee4j/openmq</url>
Expand Down
2 changes: 1 addition & 1 deletion mq/main/bridge/bridge-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>bridge</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/bridge/bridge-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>bridge</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/bridge/bridge-jms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>bridge</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/bridge/bridge-stomp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>bridge</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/bridge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
</parent>

<artifactId>bridge</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mq/main/comm-io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/comm-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/http-tunnel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/http-tunnel/tunnel-api-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>http-tunnel</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/http-tunnel/tunnel-api-share/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>http-tunnel</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/http-tunnel/tunnel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>http-tunnel</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/jaxm-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/logger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-admin/admin-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-admin</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-admin/admin-gui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-admin</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/broker-comm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-broker</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/broker-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-broker</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
</parent>

<artifactId>mqbroker-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/cluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-broker</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/partition/persist-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-partition</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/partition/persist-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-partition</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/partition/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-broker</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
</parent>

<artifactId>mq-partition</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/persist-file/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-broker</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/persist-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-broker</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-broker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
</parent>

<artifactId>mq-broker</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-direct/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-jmsra/jmsra-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>jmsra</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-jmsra/jmsra-ra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>jmsra</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
</parent>

<artifactId>mqjmsra-ra</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-jmsra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-share/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mq-ums/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/mqjmx-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/packager-opensource/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
</parent>

<artifactId>mq-packager-opensource</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mq/main/persist/disk-io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>persist</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/persist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/persist/txnlog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>persist</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>project</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
</parent>

<artifactId>mq</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mq/main/portunif/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.mq</groupId>
<artifactId>mq</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<name>MQ Parent Project</name>
<groupId>org.glassfish.mq</groupId>
<artifactId>project</artifactId>
<version>5.1.4.payara-p3-SNAPSHOT</version>
<version>5.1.4.payara-p4-SNAPSHOT/version>
<url>https://github.com/eclipse-ee4j/openmq</url>

<scm>
Expand Down
8 changes: 7 additions & 1 deletion mq/src/buildant/distrules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<!--

Copyright (c) 2010, 2017 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -270,6 +271,12 @@
</fileset>
</copy>

<copy tofile="${mq.zip.installdir}/legal/NOTICE.txt">
<fileset dir="${base_src.dir}/../..">
<include name="NOTICE.md"/>
</fileset>
</copy>

<!-- lib/dtd dir -->
<echo message="### lib/dtd"/>
<mkdir dir="${mq.zip.installdir}/lib/dtd"/>
Expand Down Expand Up @@ -1233,7 +1240,6 @@ IMQ_DEFAULT_VARHOME=../../glassfish/domains/domain1/imq]]>
<zip file="${mq.bundlesdir}/mq.zip">
<zipfileset dir="${mq.zip.installdir}/.." includes="mq/bin/**" filemode="755" />
<zipfileset dir="${mq.zip.installdir}/.." includes="mq/**"/>
<zipfileset dir="${ws.top.dir}" includes="LICENSE.md,NOTICE.md"/>
</zip>
</target>

Expand Down