[thredds] 02/26: Successful build
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Oct 23 10:24:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch ichec/master
in repository thredds.
commit bf897289afd899ba252a16236735592f4bc50b0a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Nov 26 16:49:28 2014 +0000
Successful build
---
cdm/pom.xml | 3 +-
dap4/d4cdmclient/pom.xml | 85 ++++++-------
dap4/d4cdmshared/pom.xml | 80 ++++++------
dap4/d4client/pom.xml | 187 +++++++++++++--------------
dap4/d4core/pom.xml | 36 ++++--
dap4/d4servlet/pom.xml | 109 +++++++---------
dap4/d4servletshared/pom.xml | 99 ++++++---------
dap4/d4shared/pom.xml | 93 +++++++-------
dap4/d4tests/pom.xml | 289 +++++++++++++++---------------------------
dap4/d4ts/pom.xml | 112 +++++++---------
dap4/d4tswar/pom.xml | 207 ++++++++++++++----------------
debian/README.source | 9 ++
debian/changelog | 6 +
debian/compat | 1 +
debian/control | 22 ++++
debian/copyright | 31 +++++
debian/libthredds-java.poms | 40 ++++++
debian/maven.cleanIgnoreRules | 1 +
debian/maven.ignoreRules | 2 +
debian/maven.properties | 5 +
debian/maven.publishedRules | 1 +
debian/maven.rules | 23 ++++
debian/rules | 10 ++
debian/source/format | 1 +
opendap/dtswar/pom.xml | 188 ++++++++++++---------------
pom.xml | 66 ++--------
26 files changed, 812 insertions(+), 894 deletions(-)
diff --git a/cdm/pom.xml b/cdm/pom.xml
index 9407e8f..9441f40 100644
--- a/cdm/pom.xml
+++ b/cdm/pom.xml
@@ -11,8 +11,9 @@
<!-- ===========================================================
Module Description
=========================================================== -->
- <!-- groupId>edu.ucar</groupId-->
+ <groupId>edu.ucar</groupId>
<artifactId>cdm</artifactId>
+ <version>4.5.3</version>
<packaging>jar</packaging>
<name>CDM core library</name>
diff --git a/dap4/d4cdmclient/pom.xml b/dap4/d4cdmclient/pom.xml
index e7c5819..60614b1 100644
--- a/dap4/d4cdmclient/pom.xml
+++ b/dap4/d4cdmclient/pom.xml
@@ -1,18 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4cdmclient</artifactId>
-<packaging>jar</packaging>
-
-<!-- ===========================================================
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4cdmclient</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <!-- ===========================================================
Dependencies: Mandatory dependencies are listed first. Then
everything else is declared with the
"provided" scope, meaning that the user have
@@ -20,33 +28,22 @@ Dependencies: Mandatory dependencies are listed first. Then
own pom.xml file if we want to read some
formats.
=========================================================== -->
-
-<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4shared</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4cdmshared</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- CDM -->
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <version>${project.version}</version>
- <!-- version>${project.version}</version -->
- <scope>provided</scope>
- </dependency>
-
-</dependencies>
-
-</project>
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4cdmshared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <!-- CDM -->
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/dap4/d4cdmshared/pom.xml b/dap4/d4cdmshared/pom.xml
index fbc3894..563bfce 100644
--- a/dap4/d4cdmshared/pom.xml
+++ b/dap4/d4cdmshared/pom.xml
@@ -1,18 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4cdmshared</artifactId>
-<packaging>jar</packaging>
-
-<!-- ===========================================================
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4cdmshared</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <!-- ===========================================================
Dependencies: Mandatory dependencies are listed first. Then
everything else is declared with the
"provided" scope, meaning that the user have
@@ -20,21 +28,19 @@ Dependencies: Mandatory dependencies are listed first. Then
own pom.xml file if we want to read some
formats.
=========================================================== -->
-
-<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4shared</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Servlet -->
-<!--
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <!-- Servlet -->
+ <!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -42,16 +48,6 @@ Dependencies: Mandatory dependencies are listed first. Then
<scope>provided</scope>
</dependency>
-->
-
- <!-- CDM -->
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <version>${project.version}</version>
- <!-- version>${project.version}</version -->
- <!-- scope>provided</scope -->
- </dependency>
-
-</dependencies>
-
-</project>
+ <!-- CDM -->
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/dap4/d4client/pom.xml b/dap4/d4client/pom.xml
index 300255a..45efcca 100644
--- a/dap4/d4client/pom.xml
+++ b/dap4/d4client/pom.xml
@@ -1,8 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
+ <artifactId>d4client</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <!--
This module exists to create a (mostly) stand-alone
jar file for Java clients that want to access
dap4 servers directly. The following jars
@@ -12,18 +30,7 @@
* httpmime-4.2.X.jar
* slf4 logging jar.
-->
-
- <parent>
- <groupId>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>d4client</artifactId>
- <packaging>jar</packaging>
-
- <!-- ===========================================================
+ <!-- ===========================================================
Dependencies: Mandatory dependencies are listed first. Then
everything else is declared with the
"provided" scope, meaning that the user have
@@ -31,84 +38,70 @@
own pom.xml file if we want to read some
formats.
=========================================================== -->
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4shared</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Apache HttpClient -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${org.apache.httpcomponents.httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${org.apache.httpcomponents.httpcore.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>${org.apache.httpcomponents.httpmime.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>httpservices</artifactId>
- <version>${project.version}</version>
- <!-- version>${project.version}</version -->
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <finalName>dap4-${dap4.version}</finalName>
- <artifactSet>
- <excludes>
- <exclude>org.apache.httpclient:httpcore</exclude>
- <exclude>org.apache.httpclient:httpclient</exclude>
- <exclude>org.apache.httpclient:httpmime</exclude>
- <exclude>classworlds:classworlds</exclude>
- <exclude>junit:junit</exclude>
- <exclude>jmock:*</exclude>
- <exclude>*:xml-apis</exclude>
- <exclude>org.apache.maven:lib:tests</exclude>
- <exclude>log4j:log4j:jar:</exclude>
- </excludes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
-</project>
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <!-- Apache HttpClient -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <finalName>dap4-${dap4.version}</finalName>
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.httpclient:httpcore</exclude>
+ <exclude>org.apache.httpclient:httpclient</exclude>
+ <exclude>org.apache.httpclient:httpmime</exclude>
+ <exclude>classworlds:classworlds</exclude>
+ <exclude>junit:junit</exclude>
+ <exclude>jmock:*</exclude>
+ <exclude>*:xml-apis</exclude>
+ <exclude>org.apache.maven:lib:tests</exclude>
+ <exclude>log4j:log4j:jar:</exclude>
+ </excludes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/dap4/d4core/pom.xml b/dap4/d4core/pom.xml
index 961ca9a..8a1e9d2 100644
--- a/dap4/d4core/pom.xml
+++ b/dap4/d4core/pom.xml
@@ -1,15 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4core</artifactId>
-<packaging>jar</packaging>
-
-</project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+</project>
\ No newline at end of file
diff --git a/dap4/d4servlet/pom.xml b/dap4/d4servlet/pom.xml
index 9024cdb..51916d9 100644
--- a/dap4/d4servlet/pom.xml
+++ b/dap4/d4servlet/pom.xml
@@ -1,64 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4servlet</artifactId>
-<packaging>jar</packaging>
-<dependencies>
- <dependency>
-
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4shared</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4servletshared</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- thredds dependencies -->
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <version>${project.version}</version>
- <!-- version>${project.version}</version -->
- </dependency>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>netcdf4</artifactId>
- <version>${project.version}</version>
- <!-- version>${project.version}</version -->
- </dependency>
-
- <!-- library dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>runtime</scope>
- </dependency>
-</dependencies>
-
-</project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4servlet</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4servletshared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <!-- thredds dependencies -->
+ <!-- library dependencies -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/dap4/d4servletshared/pom.xml b/dap4/d4servletshared/pom.xml
index 2f53c91..d457c3f 100644
--- a/dap4/d4servletshared/pom.xml
+++ b/dap4/d4servletshared/pom.xml
@@ -1,58 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4servletshared</artifactId>
-<packaging>jar</packaging>
-
-<dependencies>
- <!-- module dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${thredds.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4shared</artifactId>
- <version>${thredds.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4cdmshared</artifactId>
- <version>${thredds.version}</version>
- </dependency>
-
- <!-- thredds/cdm dependencies -->
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>netcdf4</artifactId>
- <version>${thredds.version}</version>
- </dependency>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <version>${thredds.version}</version>
- </dependency>
-
- <!-- library dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${jna.groupId}</groupId>
- <artifactId>jna</artifactId>
- </dependency>
-</dependencies>
-
-</project>
-
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4servletshared</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <dependencies>
+ <!-- module dependencies -->
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>${thredds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>${thredds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4cdmshared</artifactId>
+ <version>${thredds.version}</version>
+ </dependency>
+ <!-- thredds/cdm dependencies -->
+ <!-- library dependencies -->
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/dap4/d4shared/pom.xml b/dap4/d4shared/pom.xml
index 72d22b2..f153fde 100644
--- a/dap4/d4shared/pom.xml
+++ b/dap4/d4shared/pom.xml
@@ -1,18 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4shared</artifactId>
-<packaging>jar</packaging>
-
-<!-- ===========================================================
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <!-- ===========================================================
Dependencies: Mandatory dependencies are listed first. Then
everything else is declared with the
"provided" scope, meaning that the user have
@@ -20,37 +28,26 @@ Dependencies: Mandatory dependencies are listed first. Then
own pom.xml file if we want to read some
formats.
=========================================================== -->
-
-<dependencies>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>httpservices</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${org.apache.httpcomponents.httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${org.apache.httpcomponents.httpcore.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>${org.apache.httpcomponents.httpmime.version}</version>
- </dependency>
-
-</dependencies>
-
-</project>
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/dap4/d4tests/pom.xml b/dap4/d4tests/pom.xml
index 84dcd72..41ef7eb 100644
--- a/dap4/d4tests/pom.xml
+++ b/dap4/d4tests/pom.xml
@@ -1,191 +1,102 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4tests</artifactId>
-<packaging>jar</packaging>
-
-<dependencies>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4cdmclient</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4shared</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4servletshared</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4ts</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Thredds/CDM dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>cdm</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netcdf4</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tdm</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- testing dependencies -->
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- library dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>runtime</scope>
- </dependency>
-
-</dependencies>
-
-<build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!--version>2.16</version-->
- <configuration>
- <skip>${skipTests}</skip>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- <encoding>UTF-8</encoding>
- <systemPropertyVariables>
- <file.encoding>UTF-8</file.encoding>
- </systemPropertyVariables>
- <includes>
- <include>**/TestParserDMR.java</include>
- <include>**/TestParserCE.java</include>
- <include>**/TestNc4Iosp.java</include>
- <include>**/TestServlet.java</include>
- <include>**/TestServletConstraints.java</include>
- <include>**/TestCDMClient.java</include>
- <include>**/TestDSR.java</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <excludes>
- <exclude>src/test/java/dap4/test/TestFrontPage.java</exclude>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4tests</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
- <exclude>src/test/java/dap4/test/TestHyrax.java</exclude>
- <exclude>src/test/java/dap4/test/TestSerial.java</exclude>
- <exclude>src/test/java/dap4/test/TestDap4All.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
-</build>
-
-</project>
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4cdmclient</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4servletshared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4ts</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <!-- Thredds/CDM dependencies -->
+ <!-- testing dependencies -->
+ <!-- library dependencies -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/dap4/d4ts/pom.xml b/dap4/d4ts/pom.xml
index 380485d..be6ec02 100644
--- a/dap4/d4ts/pom.xml
+++ b/dap4/d4ts/pom.xml
@@ -1,68 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4ts</artifactId>
-<packaging>jar</packaging>
-
-<dependencies>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4shared</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4servletshared</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- thredds dependencies -->
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <version>${project.version}</version>
- <!-- version>${project.version}</version -->
- </dependency>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>netcdf4</artifactId>
- <version>${project.version}</version>
- <!-- version>${project.version}</version -->
- </dependency>
-
- <!-- library dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>runtime</scope>
- </dependency>
-</dependencies>
-
-<!--
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4ts</artifactId>
+ <version>4.5.3</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4servletshared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <!-- thredds dependencies -->
+ <!-- library dependencies -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <!--
<build>
<plugins>
<plugin>
@@ -88,4 +70,4 @@
</plugins>
</build>
-->
-</project>
+</project>
\ No newline at end of file
diff --git a/dap4/d4tswar/pom.xml b/dap4/d4tswar/pom.xml
index d194c7a..6d0ae95 100644
--- a/dap4/d4tswar/pom.xml
+++ b/dap4/d4tswar/pom.xml
@@ -1,115 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
-</parent>
-
-<artifactId>d4tswar</artifactId>
-<packaging>war</packaging>
-
-<dependencies>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4servletshared</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4shared</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>d4ts</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- thredds dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>cdm</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netcdf4</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- library dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>runtime</scope>
- </dependency>
-</dependencies>
-
-<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <warName>d4ts</warName>
- <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
- <webResources>
- <resource>
- <targetPath>WEB-INF</targetPath>
- <directory>../d4tests/src/test/data/resources</directory>
- <includes>
- <include>favicon.ico</include>
- </includes>
- </resource>
- <resource>
- <targetPath>WEB-INF</targetPath>
- <directory>src/main/webapp/WEB-INF</directory>
- <includes>
- <include>log4j.xml</include>
- </includes>
- </resource>
- <resource>
- <targetPath>WEB-INF/resources/testfiles</targetPath>
- <directory>../d4tests/src/test/data/resources/testfiles</directory>
- <includes>
- <include>*.syn</include>
- <include>*.nc</include>
- <include>*.hdf5</include>
- </includes>
- </resource>
- <resource>
- <targetPath>WEB-INF/resources/testfiles/dmr</targetPath>
- <directory>../d4tests/src/test/data/resources/testfiles/dmr</directory>
- <includes>
- <include>*.dmr</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
-</build>
-
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4tswar</artifactId>
+ <version>4.5.3</version>
+ <packaging>war</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4servletshared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4shared</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>d4ts</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <!-- thredds dependencies -->
+ <!-- library dependencies -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warName>d4ts</warName>
+ <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+ <webResources>
+ <resource>
+ <targetPath>WEB-INF</targetPath>
+ <directory>../d4tests/src/test/data/resources</directory>
+ <includes>
+ <include>favicon.ico</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>WEB-INF</targetPath>
+ <directory>src/main/webapp/WEB-INF</directory>
+ <includes>
+ <include>log4j.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>WEB-INF/resources/testfiles</targetPath>
+ <directory>../d4tests/src/test/data/resources/testfiles</directory>
+ <includes>
+ <include>*.syn</include>
+ <include>*.nc</include>
+ <include>*.hdf5</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>WEB-INF/resources/testfiles/dmr</targetPath>
+ <directory>../d4tests/src/test/data/resources/testfiles/dmr</directory>
+ <includes>
+ <include>*.dmr</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
<!--
<targetPath>WEB-INF</targetPath>
@@ -123,4 +106,4 @@
<Built-On>${maven.build.timestamp}</Built-On>
</manifestEntries>
</archive>
--->
+-->
\ No newline at end of file
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..46ad22b
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about thredds
+-------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..1209ad2
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+thredds (4.5.3-1) UNRELEASED; urgency=medium
+
+ * Initial release (Closes: #nnnn) <nnnn is the bug number of your
+ ITP>
+
+ -- Alastair <mckinstry at debian.org> Wed, 26 Nov 2014 16:47:01 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..ec6307d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,22 @@
+Source: thredds
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Alastair <mckinstry at debian.org>
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends-Indep: libmaven-shade-plugin-java, libmaven-war-plugin-java, libcommons-cli-java,
+ libhttpclient-java, libhttpcore-java, libhttpmime-java, libjstl1.1-java,
+ liblog4j2-java, libspring-web-servlet-java
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/thredds.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/thredds.git
+Homepage: http://www.unidata.ucar.edu/software/netcdf-java/
+
+Package: libthredds-java
+Architecture: all
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
+Description: Parent THREDDS and CDM modules
+ The Unidata THREDDS project includes the netCDF-Java library (aka CDM)
+ and the THREDDS Data Server (TDS).
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..9277310
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Parent THREDDS and CDM modules
+Source: http://www.unidata.ucar.edu/software/netcdf-java/
+
+Files: *
+Copyright: 1999-2014, UCAR/Unidata
+License: Apache-2.0 or BSD or GPL-3 or GPL-4 or LGPL-2.1
+
+Files: debian/*
+Copyright: 2014, Alastair <mckinstry at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
+
+License: BSD
+ TODO: include the full text of the license here
+
+License: GPL-3
+ On Debian systems, the full text of the GPL-3 license
+ can be found in the file '/usr/share/common-licenses/GPL-3'
+
+License: GPL-4
+ TODO: include the full text of the license here
+
+License: LGPL-2.1
+ On Debian systems, the full text of the LGPL-2.1 license
+ can be found in the file '/usr/share/common-licenses/LGPL-2.1'
+
+
diff --git a/debian/libthredds-java.poms b/debian/libthredds-java.poms
new file mode 100644
index 0000000..2e45520
--- /dev/null
+++ b/debian/libthredds-java.poms
@@ -0,0 +1,40 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --has-package-version
+udunits/pom.xml --has-package-version
+opendap/dtswar/pom.xml --has-package-version
+dap4/d4core/pom.xml --has-package-version
+dap4/d4shared/pom.xml --has-package-version
+dap4/d4client/pom.xml --has-package-version
+dap4/d4cdmshared/pom.xml --has-package-version
+dap4/d4cdmclient/pom.xml --has-package-version
+dap4/d4servletshared/pom.xml --has-package-version
+dap4/d4servlet/pom.xml --has-package-version
+dap4/d4ts/pom.xml --has-package-version
+dap4/d4tests/pom.xml --ignore
+dap4/d4tswar/pom.xml --has-package-version
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..cb61b8e
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,2 @@
+
+edu.ucar d4tests jar * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..b2cb63d
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,23 @@
+
+com.google.guava guava bundle s/.*/debian/ * *
+com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
+edu.ucar d4cdmclient jar * * *
+edu.ucar d4cdmshared jar * * *
+edu.ucar d4client jar * * *
+edu.ucar d4core jar * * *
+edu.ucar d4servlet jar * * *
+edu.ucar d4servletshared jar * * *
+edu.ucar d4shared jar * * *
+edu.ucar d4ts jar * * *
+edu.ucar d4tswar war * * *
+edu.ucar dtswar war * * *
+edu.ucar thredds-parent pom * * *
+edu.ucar udunits jar * * *
+javax.servlet jstl jar s/.*/1.1/ * *
+joda-time joda-time jar s/.*/debian/ * *
+net.jcip jcip-annotations jar s/.*/debian/ * *
+org.jsoup jsoup jar s/.*/debian/ * *
+org.quartz-scheduler quartz jar s/.*/debian/ * *
+org.springframework * * s/3\..*/3.x/ * *
+s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
+s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f285496
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
+
+get-orig-source:
+ uscan --download-current-version --force-download --no-symlink
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/opendap/dtswar/pom.xml b/opendap/dtswar/pom.xml
index c6ef432..c1e00bf 100644
--- a/opendap/dtswar/pom.xml
+++ b/opendap/dtswar/pom.xml
@@ -1,109 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<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>edu.ucar</groupId>
- <artifactId>thredds-parent</artifactId>
- <version>4.5.3</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <!-- ===========================================================
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>dtswar</artifactId>
+ <version>4.5.3</version>
+ <packaging>war</packaging>
+ <parent>
+ <groupId>edu.ucar</groupId>
+ <artifactId>thredds-parent</artifactId>
+ <version>4.5.3</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+
+ <debian.package>libthredds-java</debian.package>
+ </properties>
+
+ <!-- ===========================================================
Module Description
=========================================================== -->
- <!-- groupId>edu.ucar</groupId-->
- <artifactId>dtswar</artifactId>
- <packaging>war</packaging>
- <name>DAP Test Server (DTS) webapp</name>
- <description>
- DAP server to serve up DAP test cases.
- </description>
- <url>http://www.unidata.ucar.edu/software/netcdf-java/</url>
-
- <developers>
- <developer>
- <name>Dennis Heimbigner</name>
- <organization>UCAR/UNIDATA</organization>
- <organizationUrl>http://www.unidata.ucar.edu/</organizationUrl>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Nathan Potter</name>
- <organization>OPeNDAP.org</organization>
- <organizationUrl>http://www.opendap.org/</organizationUrl>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- </developers>
-
- <!-- ===========================================================
+ <!-- groupId>edu.ucar</groupId-->
+ <name>DAP Test Server (DTS) webapp</name>
+ <description>DAP server to serve up DAP test cases.</description>
+ <url>http://www.unidata.ucar.edu/software/netcdf-java/</url>
+ <developers>
+ <developer>
+ <name>Dennis Heimbigner</name>
+ <organization>UCAR/UNIDATA</organization>
+ <organizationUrl>http://www.unidata.ucar.edu/</organizationUrl>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Nathan Potter</name>
+ <organization>OPeNDAP.org</organization>
+ <organizationUrl>http://www.opendap.org/</organizationUrl>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+ <!-- ===========================================================
Dependencies
=========================================================== -->
- <dependencies>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>opendap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </dependency>
-
- <!-- tomcat -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>dts</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- <configuration>
- <webXml>src\main\webapp\WEB-INF\web.xml</webXml>
- <attachClasses>true</attachClasses>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Built-On>${maven.build.timestamp}</Built-On>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
-</project>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ <!-- tomcat -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>dts</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <webXml>src\main\webapp\WEB-INF\web.xml</webXml>
+ <attachClasses>true</attachClasses>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Built-On>${maven.build.timestamp}</Built-On>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9d68878..58d1900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,12 +228,6 @@
<version>debian</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>debian</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<!-- Adapts apache commons to slf4j, and so replaces commons-logging.jar -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -280,11 +274,6 @@
<artifactId>spring-webmvc</artifactId>
<version>3.x</version>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>3.x</version>
- </dependency>
<!-- spring security -->
<dependency>
<groupId>org.springframework.security</groupId>
@@ -406,12 +395,6 @@
<version>debian</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.x</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>debian</version>
@@ -527,14 +510,8 @@
<!-- server -->
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>debian</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>debian</version>
+ <version>1.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -625,29 +602,10 @@
<type>war</type>
</dependency -->
<!-- test -->
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- <version>debian</version>
- </dependency>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>dap4tests</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- <version>debian</version>
- </dependency>
</dependencies>
</dependencyManagement>
<!-- All modules use JUnit for their test. -->
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- ===========================================================
Build configuration
@@ -733,11 +691,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
</plugin>
@@ -779,7 +732,7 @@
<module>dap4/d4tswar</module>
</modules>
<properties>
- <thredds.version>4.5.0-SNAPSHOT</thredds.version>
+ <thredds.version>4.5.3</thredds.version>
<!-- default is to skip tests. use mvn test -DskipTests=false to override on command line -->
<skipTests>true</skipTests>
<!-- Source character encoding (different plug-ins use different sourceEncoding properties) -->
@@ -851,14 +804,11 @@
<cargo-plugin.version>1.4.5</cargo-plugin.version>
<!-- apache.download>http://mirrors.ibiblio.org/apache/</apache.download -->
<tomcat7.version>7.0.54</tomcat7.version>
-
- <debian.hasPackageVersion/>
-
- <debian.mavenRules>edu.ucar thredds-parent pom * * *,
+ <debian.hasPackageVersion>
+ </debian.hasPackageVersion>
+ <debian.mavenRules>edu.ucar thredds-parent pom * * *,
edu.ucar udunits jar * * *</debian.mavenRules>
-
- <debian.originalVersion>4.5.3</debian.originalVersion>
-
- <debian.package>libthredds-java</debian.package>
+ <debian.originalVersion>4.5.3</debian.originalVersion>
+ <debian.package>libthredds-java</debian.package>
</properties>
-</project>
\ No newline at end of file
+</project>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/thredds.git
More information about the debian-science-commits
mailing list