This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch security-updates in repository https://gitbox.apache.org/repos/asf/flex-blazeds.git
commit 1669f86ae59a311d0b89e1b15b2a4058747e2424 Author: Josh Tynjala <[email protected]> AuthorDate: Mon Jan 9 15:10:51 2023 -0800 with-distribution profile to build source and binary releases The only difference in a binary-release is that the *.jar files and their dependencies are in the root lib directory --- distribution/pom.xml | 103 +++++++++++++++++++++++++++++ distribution/src/assembly/assemble-bin.xml | 49 ++++++++++++++ distribution/src/assembly/assemble-src.xml | 42 ++++++++++++ pom.xml | 32 ++------- 4 files changed, 199 insertions(+), 27 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml new file mode 100644 index 0000000..6b87cd1 --- /dev/null +++ b/distribution/pom.xml @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>blazeds</artifactId> + <version>4.8.0-SNAPSHOT</version> + </parent> + + <artifactId>distribution</artifactId> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <!-- copy all .jar files and dependencies for binary release assembly --> + <outputDirectory>${project.build.directory}/blazeds-binaries-and-dependencies</outputDirectory> + <includeScope>compile</includeScope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>3.3.0</version> + <executions> + <execution> + <id>assemble-sources-releases</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <finalName>blazeds-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/assemble-src.xml</descriptor> + <descriptor>src/assembly/assemble-bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-opt-tomcat-base</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-proxy</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-remoting</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> \ No newline at end of file diff --git a/distribution/src/assembly/assemble-bin.xml b/distribution/src/assembly/assemble-bin.xml new file mode 100644 index 0000000..4ed7ebd --- /dev/null +++ b/distribution/src/assembly/assemble-bin.xml @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + --> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>binary-release</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>../</directory> + <outputDirectory>/</outputDirectory> + <useDefaultExcludes>false</useDefaultExcludes> + <excludes> + <exclude>**/target/**</exclude> + <exclude>../in/**</exclude> + <exclude>../lib/**</exclude> + <exclude>**/*.iml</exclude> + <exclude>**/.vscode/</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.build.directory}/blazeds-binaries-and-dependencies</directory> + <outputDirectory>/lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file diff --git a/distribution/src/assembly/assemble-src.xml b/distribution/src/assembly/assemble-src.xml new file mode 100644 index 0000000..211b3d6 --- /dev/null +++ b/distribution/src/assembly/assemble-src.xml @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + --> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>source-release</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>../</directory> + <outputDirectory>/</outputDirectory> + <useDefaultExcludes>false</useDefaultExcludes> + <excludes> + <exclude>**/target/**</exclude> + <exclude>../in/**</exclude> + <exclude>../lib/**</exclude> + <exclude>**/*.iml</exclude> + <exclude>**/.vscode/</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file diff --git a/pom.xml b/pom.xml index fe6000c..b06efac 100755 --- a/pom.xml +++ b/pom.xml @@ -370,35 +370,13 @@ </dependencies> </dependencyManagement> - <!-- When building on the apache ci server, we want to get some source-release archives --> <profiles> + <!-- create source-release and binary-relase archives --> <profile> - <id>flex-ci-build</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>3.3.0</version> - <executions> - <execution> - <id>assemble-sources-releases</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptors> - <descriptor>src/assembly/assemble-zip.xml</descriptor> - <descriptor>src/assembly/assemble-gz.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> + <id>with-distribution</id> + <modules> + <module>distribution</module> + </modules> </profile> </profiles>
