[java-metadata-aggregator] branch dev/MDA-266 updated: MDA-266 - Rework module structure and packaging
Ian Young
ian at iay.org.uk
Fri Dec 3 17:41:24 UTC 2021
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch dev/MDA-266
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=1a4ce42e44202cb3c6991a7dfe522e093de24b20
The following commit(s) were added to refs/heads/dev/MDA-266 by this push:
new 1a4ce42 MDA-266 - Rework module structure and packaging
1a4ce42 is described below
commit 1a4ce42e44202cb3c6991a7dfe522e093de24b20
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Dec 3 17:41:19 2021 +0000
MDA-266 - Rework module structure and packaging
Stage 2: break distribution packaging out into a new module.
---
mda-cli/pom.xml | 35 ---------------------
mda-distribution/.gitignore | 1 +
mda-distribution/.project | 17 ++++++++++
{mda-cli => mda-distribution}/pom.xml | 36 ++++++----------------
.../src/main/assembly/bin.xml | 0
.../src/script/bash/mda.sh | 0
.../src/script/bat/cpappend.bat | 0
.../src/script/bat/mda.bat | 0
pom.xml | 1 +
9 files changed, 29 insertions(+), 61 deletions(-)
diff --git a/mda-cli/pom.xml b/mda-cli/pom.xml
index ce70dac..9654dd5 100644
--- a/mda-cli/pom.xml
+++ b/mda-cli/pom.xml
@@ -43,46 +43,11 @@
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mda-keylists-rsa</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${httpclient.groupId}</groupId>
- <artifactId>httpclient</artifactId>
- <scope>runtime</scope>
- </dependency>
<!-- Test Dependencies -->
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<distributionManagement>
<site>
<id>site</id>
diff --git a/mda-distribution/.gitignore b/mda-distribution/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/mda-distribution/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/mda-distribution/.project b/mda-distribution/.project
new file mode 100644
index 0000000..8d11502
--- /dev/null
+++ b/mda-distribution/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>mda-distribution</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/mda-cli/pom.xml b/mda-distribution/pom.xml
similarity index 74%
copy from mda-cli/pom.xml
copy to mda-distribution/pom.xml
index ce70dac..3544a48 100644
--- a/mda-cli/pom.xml
+++ b/mda-distribution/pom.xml
@@ -10,39 +10,23 @@
<version>0.10.0-SNAPSHOT</version>
</parent>
- <name>Command Line Interface</name>
- <description>Command Line Interface</description>
- <artifactId>mda-cli</artifactId>
- <packaging>jar</packaging>
-
- <properties>
- <automatic.module.name>net.shibboleth.metadata.cli</automatic.module.name>
- <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
- </properties>
+ <name>Distribution Packages</name>
+ <description>Distribution Packages</description>
+ <artifactId>mda-distribution</artifactId>
+ <packaging>pom</packaging>
<dependencies>
<!-- Compile Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mda-framework</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mda-cli</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mda-keylists-rsa</artifactId>
diff --git a/mda-cli/src/main/assembly/bin.xml b/mda-distribution/src/main/assembly/bin.xml
similarity index 100%
rename from mda-cli/src/main/assembly/bin.xml
rename to mda-distribution/src/main/assembly/bin.xml
diff --git a/mda-cli/src/script/bash/mda.sh b/mda-distribution/src/script/bash/mda.sh
similarity index 100%
rename from mda-cli/src/script/bash/mda.sh
rename to mda-distribution/src/script/bash/mda.sh
diff --git a/mda-cli/src/script/bat/cpappend.bat b/mda-distribution/src/script/bat/cpappend.bat
similarity index 100%
rename from mda-cli/src/script/bat/cpappend.bat
rename to mda-distribution/src/script/bat/cpappend.bat
diff --git a/mda-cli/src/script/bat/mda.bat b/mda-distribution/src/script/bat/mda.bat
similarity index 100%
rename from mda-cli/src/script/bat/mda.bat
rename to mda-distribution/src/script/bat/mda.bat
diff --git a/pom.xml b/pom.xml
index ef5bd40..1f6d4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
<module>mda-keylists-rsa</module>
<module>mda-framework</module>
<module>mda-cli</module>
+ <module>mda-distribution</module>
<module>mda-bom</module>
</modules>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list