[LIB-4] Change maven structure in pom.xml

git-svn-id: https://svn.hedgecode.org/xml/hespiff/trunk@156 fb0bcced-7025-49ed-a12f-f98bce993226

diff --git a/pom.xml b/pom.xml
index c648b54..c4c4ddd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,11 +20,12 @@
          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>

+    <parent>

         <groupId>org.hedgecode.maven</groupId>

-        <artifactId>maven-parent</artifactId>

-        <version>1</version>

-    </parent-->

+        <artifactId>lib-parent</artifactId>

+        <version>2</version>

+        <relativePath>../lib-parent/pom.xml</relativePath>

+    </parent>

 

     <groupId>org.hedgecode.xml</groupId>

     <artifactId>hespiff</artifactId>

@@ -37,21 +38,42 @@
     </description>

     <inceptionYear>2015</inceptionYear>

 

-    <url>http://hedgecode.org/xml/${project.artifactId}/</url>

+    <url>http://lib.hedgecode.org/${project.artifactId}/</url>

 

     <scm>

         <connection>scm:svn:http://svn.hedgecode.org/xml/${project.artifactId}/trunk/</connection>

-        <developerConnection>scm:svn:http://svn.hedgecode.org/xml/${project.artifactId}/trunk/</developerConnection>

+        <developerConnection>scm:svn:https://svn.hedgecode.org/xml/${project.artifactId}/trunk/</developerConnection>

         <url>http://svn.hedgecode.org/xml/${project.artifactId}/trunk/</url>

     </scm>

 

+    <issueManagement>

+        <system>JIRA</system>

+        <url>http://issues.hedgecode.org/browse/${issueKey}/component/${issueComponentId}</url>

+    </issueManagement>

+

+    <distributionManagement>

+        <site>

+            <id>hedgecode.website</id>

+            <name>Hedgecode Libs Website</name>

+            <url>dav:https://hedgecode.org/libs/${project.artifactId}/</url>

+        </site>

+    </distributionManagement>

+

     <properties>

         <javaVersion>7</javaVersion>

         <maven.compiler.source>1.${javaVersion}</maven.compiler.source>

         <maven.compiler.target>1.${javaVersion}</maven.compiler.target>

-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

+

         <junitVersion>4.8.2</junitVersion>

+        <mavenDependencyPluginVersion>2.8</mavenDependencyPluginVersion>

+        <mavenAssemblyPluginVersion>2.4.1</mavenAssemblyPluginVersion>

+        <mavenResourcesPluginVersion>2.7</mavenResourcesPluginVersion>

+        <relaxngMavenPluginVersion>1.1</relaxngMavenPluginVersion>

+        <jaxb2MavenPluginVersion>2.2</jaxb2MavenPluginVersion>

+        <mavenJaxb2PluginVersion>0.13.1</mavenJaxb2PluginVersion>

+        <buildHelperMavenPluginVersoin>1.9.1</buildHelperMavenPluginVersoin>

+        <issueComponentId>10020</issueComponentId>

+        <issueNumber>4</issueNumber>

 

         <project.package>${project.groupId}.xspf</project.package>

         <xsd.directory>${project.basedir}/src/main/xsd</xsd.directory>

@@ -61,13 +83,6 @@
         <generated.xsd.directory>${project.build.directory}/generated-xsd</generated.xsd.directory>

         <generated.sources.directory>${project.build.directory}/generated-sources</generated.sources.directory>

         <generated.meta.directory>${project.build.outputDirectory}/META-INF</generated.meta.directory>

-

-        <!--mavenDependencyPluginVersion>2.8</mavenDependencyPluginVersion>

-        <mavenJarPluginVersion>2.5</mavenJarPluginVersion>

-        <mavenAssemblyPluginVersion>2.4.1</mavenAssemblyPluginVersion>

-        <mavenReleasePluginVersion>2.5.3</mavenReleasePluginVersion-->

-

-        <issueKeyNumber>LIB-4</issueKeyNumber>

     </properties>

 

     <dependencies>

@@ -84,7 +99,7 @@
             <!--plugin>

               <groupId>org.apache.maven.plugins</groupId>

               <artifactId>maven-resources-plugin</artifactId>

-              <version>2.7</version>

+              <version>${mavenResourcesPluginVersion}</version>

               <executions>

                   <execution>

                       <id>copy-xsd</id>

@@ -104,34 +119,34 @@
               </executions>

             </plugin-->

             <plugin>

-              <groupId>org.apache.maven.plugins</groupId>

-              <artifactId>maven-resources-plugin</artifactId>

-              <version>2.7</version>

-              <executions>

-                  <execution>

-                      <id>copy-xsd</id>

-                      <phase>validate</phase>

-                      <goals>

-                          <goal>copy-resources</goal>

-                      </goals>

-                      <configuration>

-                          <outputDirectory>${generated.meta.directory}</outputDirectory>

-                          <resources>

-                              <resource>

-                                  <directory>${xsd.directory}</directory>

-                              </resource>

-                              <resource>

-                                  <directory>${relaxng.directory}</directory>

-                              </resource>

-                          </resources>

-                      </configuration>

-                  </execution>

-              </executions>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-resources-plugin</artifactId>

+                <version>${mavenResourcesPluginVersion}</version>

+                <executions>

+                    <execution>

+                        <id>copy-xsd</id>

+                        <phase>validate</phase>

+                        <goals>

+                            <goal>copy-resources</goal>

+                        </goals>

+                        <configuration>

+                            <outputDirectory>${generated.meta.directory}</outputDirectory>

+                            <resources>

+                                <resource>

+                                    <directory>${xsd.directory}</directory>

+                                </resource>

+                                <resource>

+                                    <directory>${relaxng.directory}</directory>

+                                </resource>

+                            </resources>

+                        </configuration>

+                    </execution>

+                </executions>

             </plugin>

             <plugin>

                 <groupId>us.bryon</groupId>

                 <artifactId>relaxng-maven-plugin</artifactId>

-                <version>1.1</version>

+                <version>${relaxngMavenPluginVersion}</version>

                 <executions>

                     <execution>

                         <phase>generate-sources</phase>

@@ -152,7 +167,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxb2-maven-plugin</artifactId>

-                <version>2.2</version>

+                <version>${jaxb2MavenPluginVersion}</version>

                 <executions>

                     <execution>

                         <phase>generate-sources</phase>

@@ -173,7 +188,7 @@
             <plugin>

                 <groupId>org.jvnet.jaxb2.maven2</groupId>

                 <artifactId>maven-jaxb2-plugin</artifactId>

-                <version>0.13.1</version>

+                <version>${mavenJaxb2PluginVersion}</version>

                 <executions>

                     <execution>

                         <phase>generate-sources</phase>

@@ -192,7 +207,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.9.1</version>

+                <version>${buildHelperMavenPluginVersoin}</version>

                 <executions>

                     <execution>

                         <phase>generate-sources</phase>

@@ -208,7 +223,66 @@
                     </execution>

                 </executions>

             </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-jar-plugin</artifactId>

+                <version>${mavenJarPluginVersion}</version>

+                <configuration>

+                    <archive>

+                        <manifest>

+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>

+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>

+                            <mainClass>org.hedgecode.xml.xspf.XSPFApp</mainClass>

+                        </manifest>

+                        <manifestEntries>

+                            <Implementation-Title>${project.artifactId}</Implementation-Title>

+                        </manifestEntries>

+                    </archive>

+                </configuration>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-release-plugin</artifactId>

+                <version>${mavenReleasePluginVersion}</version>

+                <configuration>

+                    <tagBase>https://svn.hedgecode.org/xml/${project.artifactId}/tags</tagBase>

+                    <branchBase>https://svn.hedgecode.org/xml/${project.artifactId}/branches</branchBase>

+                    <preparationGoals>clean install</preparationGoals>

+                    <goals>deploy</goals>

+                    <releaseProfiles>release</releaseProfiles> <!-- todo: hedgecode-release -->

+                    <scmCommentPrefix xml:space="preserve">[${issueKey}-${issueNumber}] </scmCommentPrefix>

+                </configuration>

+            </plugin>

         </plugins>

     </build>

 

+    <reporting>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-project-info-reports-plugin</artifactId>

+                <version>${mavenReportsPluginVersion}</version>

+                <configuration>

+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>

+                </configuration>

+                <reportSets>

+                    <reportSet>

+                        <reports>

+                            <report>index</report>

+                            <report>summary</report>

+                            <report>dependency-info</report>

+                            <report>project-team</report>

+                            <report>scm</report>

+                            <report>dependency-management</report>

+                            <report>dependencies</report>

+                            <report>plugin-management</report>

+                            <report>plugins</report>

+                            <report>distribution-management</report>

+                        </reports>

+                    </reportSet>

+                </reportSets>

+            </plugin>

+        </plugins>

+    </reporting>

+

 </project>

diff --git a/src/main/java/org/hedgecode/xml/xspf/XSPFApp.java b/src/main/java/org/hedgecode/xml/xspf/XSPFApp.java
new file mode 100644 (file)
index 0000000..30815bf
--- /dev/null
+++ b/src/main/java/org/hedgecode/xml/xspf/XSPFApp.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2015-2017. Developed by Hedgecode.
+ *
+ * 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.
+ */
+
+package org.hedgecode.xml.xspf;
+
+/**
+ * XSPF API Main Application.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public final class XSPFApp {
+
+    public static void main(String[] args) {
+
+    }
+
+}

diff --git a/src/main/java/org/hedgecode/xml/xspf/bind/BinderFactory.java b/src/main/java/org/hedgecode/xml/xspf/bind/BinderFactory.java
index a4cbe36..709698d 100644 (file)
--- a/src/main/java/org/hedgecode/xml/xspf/bind/BinderFactory.java
+++ b/src/main/java/org/hedgecode/xml/xspf/bind/BinderFactory.java
@@ -66,7 +66,7 @@ public final class BinderFactory {
         return new XSDTrackBinder(trackType);

     }

 

-        private static PlaylistBinder getDefaultPlaylistBinder() {

+    private static PlaylistBinder getDefaultPlaylistBinder() {

         return new RNGPlaylistBinder();

     }