This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository libjfreechart-java.

commit 97e97e3aeadbdefb6b9df36728b5ac37410c78f3
Author: Markus Koschany <a...@debian.org>
Date:   Sun Oct 16 15:41:57 2016 +0200

    Install updated pom file. Relocate to org.jfree group id.
    
    Update debian/rules and install jfreechart-swt-*.jar with install file.
---
 debian/libjfreechart-java.poms        |   2 +-
 debian/libjfreechart-swt-java.install |   1 +
 debian/poms/jfreechart.pom            | 277 ++++++++++++++++++++++++++++++++--
 debian/rules                          |  23 ++-
 4 files changed, 276 insertions(+), 27 deletions(-)

diff --git a/debian/libjfreechart-java.poms b/debian/libjfreechart-java.poms
index 159309c..a9ff140 100644
--- a/debian/libjfreechart-java.poms
+++ b/debian/libjfreechart-java.poms
@@ -1 +1 @@
-debian/poms/jfreechart.pom
+debian/poms/jfreechart.pom --no-parent --java-lib 
--artifact=debian/jfreechart-*.jar --set-version=1.0.19 
--relocate=jfree:jfreechart
diff --git a/debian/libjfreechart-swt-java.install 
b/debian/libjfreechart-swt-java.install
new file mode 100644
index 0000000..fcfafa9
--- /dev/null
+++ b/debian/libjfreechart-swt-java.install
@@ -0,0 +1 @@
+debian/jfreechart-*-swt.jar usr/share/java
diff --git a/debian/poms/jfreechart.pom b/debian/poms/jfreechart.pom
index 008b756..0c098f7 100644
--- a/debian/poms/jfreechart.pom
+++ b/debian/poms/jfreechart.pom
@@ -1,24 +1,67 @@
-<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";>
+<?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>
-    <groupId>jfree</groupId>
+
+    <name>JFreeChart</name>
+
     <artifactId>jfreechart</artifactId>
-    <name>jfreechart</name>
-    <version>1.0.13</version>
-    <url>http://www.jfree.org/jfreechart/</url>
+    <groupId>org.jfree</groupId>
+    <version>1.0.19</version>
+    <packaging>jar</packaging>
+
+    <!-- this is required to host it on Sonatype's OSSRH -->
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>9</version>
+    </parent>
+
     <organization>
         <name>JFree.org</name>
         <url>http://www.jfree.org/</url>
     </organization>
     <inceptionYear>2001</inceptionYear>
+
     <description>
-        JFreeChart is a class library, written in Java, for generating charts. 
Utilising the Java2D APIs, it currently
-        supports bar charts, pie charts, line charts, XY-plots and time series 
plots.
+    JFreeChart is a class library, written in Java, for generating charts. 
+    Utilising the Java2D APIs, it currently supports bar charts, pie charts, 
+    line charts, XY-plots and time series plots.
     </description>
+
+    <url>http://www.jfree.org/jfreechart/</url>
+    <issueManagement>
+        <url>http://sourceforge.net/tracker/?group_id=15494</url>
+    </issueManagement>
     <scm>
-        
<connection>scm:cvs:pserver:anonym...@jfreechart.cvs.sourceforge.net:/cvsroot/jfreechart:jfreechart</connection>
-        <url>http://jfreechart.cvs.sourceforge.net/jfreechart/jfreechart/</url>
+        
<connection>scm:svn:https://jfreechart.svn.sourceforge.net/svnroot/jfreechart 
jfreechart</connection>
+        <url>http://jfreechart.svn.sourceforge.net/viewvc/jfreechart/</url>
     </scm>
+
+    <mailingLists>
+        <mailingList>
+            <name>JFreeChart Developer List</name>
+            <subscribe>
+        jfreechart-dev-requ...@lists.sourceforge.net?subject=subscribe
+            </subscribe>
+            <unsubscribe>
+        jfreechart-dev-requ...@lists.sourceforge.net?subject=unsubscribe
+            </unsubscribe>
+            <archive>
+        http://sourceforge.net/mailarchive/forum.php?forum=jfreechart-dev
+            </archive>
+        </mailingList>
+    </mailingLists>
+
+    <developers>
+    <!--
+    For an up to date list of developers and contributors have a look at
+    the project info implementations.
+    -->
+    </developers>
     <licenses>
         <license>
             <name>GNU Lesser General Public Licence</name>
@@ -29,9 +72,219 @@
 
     <dependencies>
         <dependency>
-            <groupId>jfree</groupId>
+            <groupId>org.jfree</groupId>
             <artifactId>jcommon</artifactId>
-            <version>1.0.16</version>
+            <version>1.0.23</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
         </dependency>
+
     </dependencies>
+
+    <distributionManagement>
+      <snapshotRepository>
+        <id>ossrh</id>
+        <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      </snapshotRepository>
+    </distributionManagement>    
+    
+    <build>
+        <sourceDirectory>source</sourceDirectory>
+        <testSourceDirectory>tests</testSourceDirectory>
+
+        <resources>
+            <resource>
+                <directory>source</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.jpg</include>
+                    <include>**/*.</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+          
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${project.source.level}</source>
+                    <target>${project.target.level}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <excludes>
+                      <exclude>org/jfree/chart/demo/**</exclude>
+                      <exclude>org/jfree/chart/fx/**</exclude>
+                    </excludes>                
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.10</version>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/JFreeChartTestSuite.java</exclude>
+                        <exclude>**/*PackageTests.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-gpg-plugin</artifactId>
+              <version>1.5</version>
+              <executions>
+                <execution>
+                  <id>sign-artifacts</id>
+                  <phase>verify</phase>
+                  <goals>
+                    <goal>sign</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+
+            <plugin>
+              <groupId>org.sonatype.plugins</groupId>
+              <artifactId>nexus-staging-maven-plugin</artifactId>
+              <version>1.6.2</version>
+              <extensions>true</extensions>
+              <configuration>
+                <serverId>ossrh</serverId>
+                <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                <autoReleaseAfterClose>false</autoReleaseAfterClose>
+              </configuration>
+            </plugin>            
+      
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>cobertura-maven-plugin</artifactId>
+              <version>2.5.1</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <version>1.7</version>
+                <configuration>
+                    <signature>
+                        <groupId>org.codehaus.mojo.signature</groupId>
+                        <artifactId>java16</artifactId>
+                        <version>1.0</version>
+                    </signature>
+                </configuration>
+            </plugin>
+          
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.4</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.8</version>
+            </plugin>
+                
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.3</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.5.1</version>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.source.level>1.6</project.source.level>
+        <project.target.level>1.6</project.target.level>
+    </properties>
+
+  <profiles>
+    <profile> 
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <inherited>true</inherited>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.9.1</version>
+            <executions>
+              <execution>
+                <id>attach-javadoc</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <sourceFileExcludes>
+                <exclude>org/jfree/chart/fx/**</exclude>
+              </sourceFileExcludes>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/debian/rules b/debian/rules
index 7be77d7..ffd929d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,11 @@ VERSION:=1.0.19
 
 override_dh_auto_build:
        ant -f ant/build.xml compile javadoc
-       #bnd wrap --properties debian/jcommon.bnd --output 
debian/jcommon-$(VERSION).jar \
-               jcommon-$(VERSION).jar
+       bnd wrap --properties debian/jfreechart.bnd --output 
debian/jfreechart-$(VERSION).jar \
+               lib/jfreechart-$(VERSION).jar
+       ant -f ant/build-swt.xml
+       bnd wrap --properties debian/jfreechart-swt.bnd --output 
debian/jfreechart-$(VERSION)-swt.jar \
+               lib/jfreechart-$(VERSION)-swt.jar
 
 override_dh_auto_clean:
        $(RM) *.jar
@@ -19,30 +22,22 @@ override_dh_auto_clean:
        $(RM) debian/*.jar
        $(RM) -r build javadoc
 
+override_dh_link:
+       dh_link -plibjfreechart-swt-java 
/usr/share/java/jfreechart-$(VERSION)-swt.jar /usr/share/java/jfreechart-swt.jar
 
 get-orig-pom:
        mkdir -p debian/poms
-       wget  -U NoSuchBrowser/1.0 -O debian/poms/jcommon.pom \
-               
https://oss.sonatype.org/content/repositories/releases/org/jfree/jcommon/$(VERSION)/jcommon-$(VERSION).pom
+       wget  -U NoSuchBrowser/1.0 -O debian/poms/jfreechart.pom \
+               
https://oss.sonatype.org/content/repositories/releases/org/jfree/jfreechart/$(VERSION)/jfreechart-$(VERSION).pom
 
 get-orig-source:
        uscan --download-current-version --force-download --repack 
--compression xz
 
-#common-build-indep::
-#      ant -f ant/build-swt.xml
 
 #install/lib$(PACKAGE)-java::
 #      jh_manifest -c jcommon.jar lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar
-#      bnd wrap --properties debian/jfreechart.bnd --output 
debian/jfreechart-$(DEB_UPSTREAM_VERSION).jar \
-#              lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar
-#      mh_installpoms -plib$(PACKAGE)-java
-#      mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom 
debian/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
 
 #install/lib$(PACKAGE)-swt-java::
 #      jh_manifest -c "jcommon.jar jfreechart-$(DEB_UPSTREAM_VERSION).jar 
swt4.jar" \
 #              lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar
-#      bnd wrap --properties debian/jfreechart-swt.bnd --output 
debian/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar \
-#              lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar
-#      dh_install -plib$(PACKAGE)-swt-java 
debian/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar /usr/share/java
-#      dh_link -plib$(PACKAGE)-swt-java 
/usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar 
/usr/share/java/jfreechart-swt.jar
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/libjfreechart-java.git

_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to