Skip to content

Consolidated #9

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.

Sign up for GitHub

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

Open
Trumbore wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Consolidated #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e55fa7f
Update the unit test data sets
Trumbore Nov 8, 2017
9886b80
Complete the implementation of the Automated PackageTool
Trumbore Nov 13, 2017
2c730de
Use latest version of packaging projects
Trumbore Nov 13, 2017
cc508b9
Upgrade some packaging tool libraries to 1.0.8-SNAPSHOT
Trumbore Nov 15, 2017
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
151 changes: 144 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,27 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<modelVersion>4.0.0</modelVersion>
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-cli</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>Automated Packaging Command Line Tool</name>

<parent>
<groupId>org.dataconservancy</groupId>
<artifactId>project-pom</artifactId>
<version>8</version>
</parent>

<!-- Properties ================================================== -->
<properties></properties>
<properties>
<!-- definition of assembly related properties -->
<pkg.gen.assembly.standalone.id>standalone</pkg.gen.assembly.standalone.id>
<pkg.gen.assembly.standalone.fileName>${project.artifactId}</pkg.gen.assembly.standalone.fileName>
<pkg.gen.assembly.dist.id>dist</pkg.gen.assembly.dist.id>
<pkg.gen.assembly.dist.fileName>${project.artifactId}</pkg.gen.assembly.dist.fileName>
</properties>

<!-- Profiles =================================================== -->

Expand Down Expand Up @@ -46,6 +54,19 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -125,6 +146,53 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<attach>true</attach>
</configuration>
<executions>
<execution>
<id>standalone-jar</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<archive>
<manifest>
<mainClass>org.dataconservancy.packaging.tool.cli.AutomatedPackageTool</mainClass>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Version>${project.version}
r${buildNumber}</Implementation-Version>
</manifestEntries>
</archive>
<!--finalName>${pkg.gen.assembly.standalone.fileName}</finalName-->
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</execution>
<execution>
<id>dist</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<!--finalName>${pkg.gen.assembly.dist.fileName}</finalName-->
<descriptorRefs>
<descriptorRef>bin</descriptorRef>
</descriptorRefs>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -140,22 +208,42 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.10</version>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-api</artifactId>
<version>1.0.3</version>
<version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-impl</artifactId>
<version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-ser</artifactId>
<version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-model-builder</artifactId>
<version>1.0.3</version>
<version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.dataconservancy.packaging.shared</groupId>
<artifactId>dcs-packaging-shared</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.dataconservancy.rules</groupId>
<artifactId>dcs-packaging-rules</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -176,10 +264,28 @@
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-api</artifactId>
</dependency>
<dependency>
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-impl</artifactId>
</dependency>
<dependency>
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-ser</artifactId>
</dependency>
<dependency>
<groupId>org.dataconservancy.pkgtool</groupId>
<artifactId>dcs-packaging-tool-model-builder</artifactId>
</dependency>
<dependency>
<groupId>org.dataconservancy.rules</groupId>
<artifactId>dcs-packaging-rules</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Provided =================================================== -->

Expand All @@ -196,11 +302,42 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
<version>1.1.2</version>
</dependency>

</dependencies>

<!-- Repositories ======================================================== -->

<repositories>
<repository>
<id>dc.maven.releases</id>
<name>Data Conservancy Public Maven 2 Repository (releases)</name>
<layout>default</layout>
<url>http://maven.dataconservancy.org/public/releases/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>

<repository>
<id>dc.maven.snapshots</id>
<name>Data Conservancy Public Maven 2 Repository (snapshots)</name>
<layout>default</layout>
<url>http://maven.dataconservancy.org/public/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

</repositories>

<!-- Test ======================================================== -->

</project>
Loading