Skip to content

Commit

Permalink
EASY-1228: Change the pom to become independent on easy-app
Browse files Browse the repository at this point in the history
  • Loading branch information
@lindareijnhoudt
lindareijnhoudt committed Mar 7, 2017
1 parent aa541ba commit 5a0a504
Show file tree
Hide file tree
Showing 5 changed files with 210 additions and 13 deletions.
15 changes: 15 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
fixes EASY-

#### When applied it will
*
*
*

#### Where should the reviewer @DANS-KNAW/easy start?

#### How should this be manually tested?

#### related pull requests on github
repo | PR | note
-------------------------- | ----------------- | ---
easy- | [PR#](PRlink) |
41 changes: 41 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#### Maven

target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties

#### Eclipse

.project
.classpath
.settings/

#### Mac OS X

.DS_Store

#### Scala

.cache*
.tmpBin/
.worksheet/
*.sc

#### (vim?) backup files

~*
.~*

#### Sass Cache (webui)

*.scssc
.sass-cache/

#### IntelliJ
.idea
*.iml
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# easy-ddm
DANS Dataset Metadata library
110 changes: 97 additions & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) ${project.inceptionYear} DANS - Data Archiving and Networked Services ([email protected])
Licensed 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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>nl.knaw.dans.easy</groupId>
<artifactId>easy-prototype</artifactId>
<version>2.x-SNAPSHOT</version>
<relativePath>../easy-prototype</relativePath>
<groupId>nl.knaw.dans.shared</groupId>
<artifactId>dans-java-prototype</artifactId>
<version>1.32</version>
</parent>
<groupId>nl.knaw.dans.easy</groupId>
<artifactId>ddm</artifactId>
<version>2.x-SNAPSHOT</version>
<name>Dans Dataset Metadata Library</name>
<dependencies>
<dependency>
<groupId>nl.knaw.dans.easy</groupId>
<artifactId>emd</artifactId>
<version>2.17-beta-7</version>
</dependency>
<dependency>
<groupId>nl.knaw.dans.easy</groupId>
<artifactId>xml</artifactId>
<version>2.16</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>nl.knaw.dans.easy</groupId>
<artifactId>emd</artifactId>
</dependency>
<dependency>
<groupId>nl.knaw.dans.easy</groupId>
<artifactId>xml</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
Expand All @@ -47,6 +72,24 @@
</exclusions>
</dependency>
</dependencies>
<repositories>
<repository>
<id>DANS</id>
<releases>
<enabled>true</enabled>
</releases>
<url>http://maven.dans.knaw.nl/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>DANS</id>
<releases>
<enabled>true</enabled>
</releases>
<url>http://maven.dans.knaw.nl/</url>
</pluginRepository>
</pluginRepositories>
<build>
<resources>
<resource>
Expand Down Expand Up @@ -81,6 +124,47 @@
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.jfrog.buildinfo</groupId>
<artifactId>artifactory-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
<properties>
<owner>DANS - Data Archiving and Networked Services</owner>
<email>[email protected]</email>
</properties>
<excludes>
<exclude>**</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
Expand All @@ -93,7 +177,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven-dependency-plugin.version}</version>
<version>2.8</version>
<executions>
<execution>
<id>test-resources</id>
Expand Down
55 changes: 55 additions & 0 deletions src/main/assembly/bin.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright (C) ${project.inceptionYear} DANS - Data Archiving and Networked Services ([email protected])
Licensed 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.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>${project.version}</id>
<baseDirectory>${artifactId}-${version}</baseDirectory>
<formats>
<format>tar.gz</format>
</formats>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>/bin</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/assembly/dist/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/assembly/dist</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>/bin/*</exclude>
</excludes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>

0 comments on commit 5a0a504

Please sign in to comment.