Changeset 5073


Ignore:
Timestamp:
Apr 2, 2016, 2:50:21 AM (6 years ago)
Author:
Christian Schulte
Message:

o Build plugin and artifact updates.
o Site skin updates.
o Resource updates.

Closes #84

Location:
jomc-build/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • jomc-build/trunk/jomc-build-resources/src/main/resources/META-INF/LICENSE.txt.vm

    r4153 r5073  
    11
    2 #if($with-organization-copyright && $project.getOrganization())
    3     Copyright (C) $project.getOrganization().getName(), ${projectTimespan}
     2#if($with-organization-copyright && $project.getOrganization() && $project.getOrganization().getName())
     3    Copyright (C) ${projectTimespan} $project.getOrganization().getName()
    44#end
    55#if($with-developer-copyright && $project.getDevelopers() && !$project.getDevelopers().isEmpty())
    66#foreach($developer in $project.getDevelopers())
    7     Copyright (C) $developer.getName(), ${projectTimespan}
     7#if($developer.getOrganization() || $developer.getName() || $developer.getEmail())
     8    Copyright (C) ${projectTimespan}#if($developer.getOrganization()) $developer.getOrganization()#end#if($developer.getName()) $developer.getName()#end#if($developer.getEmail()) #if(!$developer.getEmail().contains('<'))<#end${developer.getEmail()}#if(!$developer.getEmail().contains('>'))>#end#end
     9
     10#end
    811#end
    912#end
  • jomc-build/trunk/jomc-build-resources/src/main/resources/META-INF/LIZENZ.txt.vm

    r4153 r5073  
    11
    2 #if($with-organization-copyright && $project.getOrganization())
    3     Copyright (C) $project.getOrganization().getName(), ${projectTimespan}
     2#if($with-organization-copyright && $project.getOrganization() && $project.getOrganization().getName())
     3    Copyright (C) ${projectTimespan} $project.getOrganization().getName()
    44#end
    55#if($with-developer-copyright && $project.getDevelopers() && !$project.getDevelopers().isEmpty())
    66#foreach($developer in $project.getDevelopers())
    7     Copyright (C) $developer.getName(), ${projectTimespan}
     7#if($developer.getOrganization() || $developer.getName() || $developer.getEmail())
     8    Copyright (C) ${projectTimespan}#if($developer.getOrganization()) $developer.getOrganization()#end#if($developer.getName()) $developer.getName()#end#if($developer.getEmail()) #if(!$developer.getEmail().contains('<'))<#end${developer.getEmail()}#if(!$developer.getEmail().contains('>'))>#end#end
     9
     10#end
    811#end
    912#end
  • jomc-build/trunk/jomc-build-resources/src/main/resources/META-INF/PROJECT.txt.vm

    r4628 r5073  
    1212
    1313  ${project.description}
     14#end
     15#if($project.licenses && !$project.licenses.empty)
     16
     17  Licenses
     18#foreach($license in $project.licenses)
     19
     20#if($license.name)
     21    Name ............... : $license.name
     22#else
     23    Name ............... : Not available.
     24#end
     25#if($license.url)
     26    URL ................ : $license.url
     27#else
     28    URL ................ : Not available.
     29#end
     30#if($license.comments)
     31    Comments ........... : $license.comments
     32#end
     33#end
    1434#end
    1535#if($project.developers && !$project.developers.empty)
     
    6686#end
    6787#end
    68 #if($project.issueManagement && $project.issueManagement.url)
     88#if($project.issueManagement)
    6989
    7090  Issue management
    71 
     91#if($project.issueManagement.system)
    7292    System ............. : $project.issueManagement.system
     93#else
     94    System ............. : Not available.
     95#end
     96#if($project.issueManagement.url)
    7397    URL ................ : $project.issueManagement.url
     98#else
     99    URL ................ : Not available.
     100#end
    74101#end
    75102#if($project.mailingLists && !$project.mailingLists.empty)
     
    101128#if($project.scm.connection)
    102129    Connection ......... : ${project.scm.connection}
     130#else
     131    Connection ......... : Not available.
    103132#end
    104133#if($project.scm.developerConnection)
    105134    Developer access ... : ${project.scm.developerConnection}
     135#else
     136    Developer access ... : Not available.
    106137#end
    107138#if($project.scm.url)
    108139    URL ................ : ${project.scm.url}
     140#else
     141    URL ................ : Not available.
    109142#end
    110143#end
  • jomc-build/trunk/jomc-build-resources/src/main/resources/META-INF/PROJEKT.txt.vm

    r4628 r5073  
    1313  ${project.description}
    1414#end
     15#if($project.licenses && !$project.licenses.empty)
     16
     17  Lizenzen
     18#foreach($license in $project.licenses)
     19
     20#if($license.name)
     21    Name ........................ : $license.name
     22#else
     23    Name ........................ : Nicht verfügbar.
     24#end
     25#if($license.url)
     26    URL ......................... : $license.url
     27#else
     28    URL ......................... : Nicht verfügbar.
     29#end
     30#if($license.comments)
     31    Kommentar ................... : $license.comments
     32#end
     33#end
     34#end
    1535#if($project.developers && !$project.developers.empty)
    1636
     
    1939
    2040#if($developer.id)
    21     Bezeichner ............. : $developer.id
     41    Bezeichner .................. : $developer.id
    2242#end
    2343#if($developer.name)
    24     Name ................... : $developer.name
     44    Name ........................ : $developer.name
    2545#end
    2646#if($developer.email)
    27     E-Mail ................. : $developer.email
     47    E-Mail ...................... : $developer.email
    2848#end
    2949#if($developer.url)
    30     URL .................... : $developer.url
     50    URL ......................... : $developer.url
    3151#end
    3252#if($developer.organization)
    33     Organisation ........... : $developer.organization
     53    Organisation ................ : $developer.organization
    3454#end
    3555#if($developer.organizationUrl)
    36     URL der Organisation ... : $developer.organizationUrl
     56    URL der Organisation ........ : $developer.organizationUrl
    3757#end
    3858#if($developer.timezone)
    39     Zeitzone ............... : $developer.timezone
     59    Zeitzone .................... : $developer.timezone
    4060#end
    4161#end
     
    4767
    4868#if($contributor.name)
    49     Name ................... : $contributor.name
     69    Name ........................ : $contributor.name
    5070#end
    5171#if($contributor.email)
    52     E-Mail ................. : $contributor.email
     72    E-Mail ...................... : $contributor.email
    5373#end
    5474#if($contributor.url)
    55     URL .................... : $contributor.url
     75    URL ......................... : $contributor.url
    5676#end
    5777#if($contributor.organization)
    58     Organisation ........... : $contributor.organization
     78    Organisation ................ : $contributor.organization
    5979#end
    6080#if($contributor.organizationUrl)
    61     URL der Organisation ... : $contributor.organizationUrl
     81    URL der Organisation ........ : $contributor.organizationUrl
    6282#end
    6383#if($contributor.timezone)
    64     Zeitzone ............... : $contributor.timezone
     84    Zeitzone .................... : $contributor.timezone
    6585#end
    6686#end
    6787#end
    68 #if($project.issueManagement && $project.issueManagement.url)
     88#if($project.issueManagement)
    6989
    7090  Problemverwaltung
    7191
    72     System ............. : $project.issueManagement.system
    73     URL ................ : $project.issueManagement.url
     92#if($project.issueManagement.system)
     93    System ...................... : $project.issueManagement.system
     94#else
     95    System ...................... : Nicht verfügbar.
     96#end
     97#if($project.issueManagement.url)
     98    URL ......................... : $project.issueManagement.url
     99#else
     100    URL ......................... : Nicht verfügbar.
     101#end
    74102#end
    75103#if($project.mailingLists && !$project.mailingLists.empty)
     
    79107
    80108#if($list.name)
    81     Name ................ : $list.name
     109    Name ........................ : $list.name
    82110#end
    83111#if($list.subscribe)
    84     Eintragung .......... : $list.subscribe
     112    Eintragung .................. : $list.subscribe
    85113#end
    86114#if($list.unsubscribe)
    87     Austragung .......... : $list.unsubscribe
     115    Austragung .................. : $list.unsubscribe
    88116#end
    89117#if($list.post)
    90     Adresse ............. : $list.post
     118    Adresse ..................... : $list.post
    91119#end
    92120#if($list.archive)
    93     Archiv .............. : $list.archive
     121    Archiv ...................... : $list.archive
    94122#end
    95123#end
     
    101129#if($project.scm.connection)
    102130    Verbindung .................. : ${project.scm.connection}
     131#else
     132    Verbindung .................. : Nicht verfügbar.
    103133#end
    104 #if($project.scm.developerConnection)
     134#if($project.scm.developerConnection && !$project.scm.developerConnection.contains("schulte.it"))
    105135    Verbindung für Entwickler ... : ${project.scm.developerConnection}
     136#else
     137    Verbindung für Entwickler ... : Nicht verfügbar.
    106138#end
    107139#if($project.scm.url)
    108140    SCM URL ..................... : ${project.scm.url}
     141#else
     142    SCM URL ..................... : Nicht verfügbar.
    109143#end
    110144#end
     
    115149#foreach ( $dependency in $projectsSortedByOrganization.get( $organization ) )
    116150
    117     Name ................... : $dependency.name
    118     Artefakt ............... : $dependency.artifact
     151    Name ........................ : $dependency.name
     152    Artefakt .................... : $dependency.artifact
    119153#if($dependency.url)
    120     URL .................... : $dependency.url
     154    URL ......................... : $dependency.url
    121155#else
    122     URL .................,,, : Nicht verfügbar.
     156    URL ......................... : Nicht verfügbar.
    123157#end
    124158#if(!$organization.getName().equals("an unknown organization"))
    125     Organisation ........... : $organization.name
     159    Organisation ................ : $organization.name
    126160#else
    127     Organisation ........... : Nicht verfügbar.
     161    Organisation ................ : Nicht verfügbar.
    128162#end
    129163#if($organization.url)
    130     URL der Organisation ... : $organization.url
     164    URL der Organisation ........ : $organization.url
    131165#else
    132     URL der Organisation ... : Nicht verfügbar.
     166    URL der Organisation ........ : Nicht verfügbar.
    133167#end
    134168#if($dependency.licenses && !$dependency.licenses.empty)
    135169#foreach($license in $dependency.licenses)
    136170#if($license.name)
    137     Lizenz ................. : $license.name
     171    Lizenz ...................... : $license.name
    138172#else
    139     Lizenz ................. : Nicht verfügbar.
     173    Lizenz ...................... : Nicht verfügbar.
    140174#end
    141175#if($license.url && ( $license.url.toLowerCase().startsWith("http") || $license.url.toLowerCase().startsWith("ftp") ) )
    142     Lizenz URL ............. : $license.url
     176    Lizenz URL .................. : $license.url
    143177#else
    144     Lizenz URL ............. : Nicht verfügbar.
     178    Lizenz URL .................. : Nicht verfügbar.
    145179#end
    146180#if($license.comments)
    147     Lizenz Kommentare ...... : $license.comments
     181    Lizenz Kommentare ........... : $license.comments
    148182#end
    149183#end
    150184#else
    151     Lizenz ................. : Nicht verfügbar.
     185    Lizenz ...................... : Nicht verfügbar.
    152186#end
    153187#if($dependency.description)
    154     Beschreibung ........... : $dependency.description
     188    Beschreibung ................ : $dependency.description
    155189#else
    156     Beschreibung ........... : Nicht verfügbar.
     190    Beschreibung ................ : Nicht verfügbar.
    157191#end
    158192#end
  • jomc-build/trunk/jomc-build-resources/src/main/resources/org/jomc/build/resources/checkstyle.xml

    r4769 r5073  
    7575    <module name="MissingSwitchDefault"/>
    7676    <module name="ModifiedControlVariable"/>
    77     <module name="RedundantThrows"/>
    7877    <module name="SimplifyBooleanExpression"/>
    7978    <module name="SimplifyBooleanReturn"/>
     
    9089    <module name="IllegalThrows"/>
    9190    <module name="PackageDeclaration"/>
    92     <module name="JUnitTestCase"/>
    9391    <module name="ParameterAssignment"/>
    9492    <module name="ExplicitInitialization"/>
  • jomc-build/trunk/pom.xml

    r4771 r5073  
    7777          <artifactId>maven-compiler-plugin</artifactId>
    7878          <version>${maven-compiler-plugin.artifact.version}</version>
     79          <configuration>
     80            <!--
     81            https://issues.apache.org/jira/browse/MPOM-63
     82            -->
     83            <source>${maven.compiler.source}</source>
     84            <target>${maven.compiler.target}</target>
     85          </configuration>
    7986        </plugin>
    8087        <plugin>
     
    8289          <artifactId>maven-site-plugin</artifactId>
    8390          <version>${maven-site-plugin.artifact.version}</version>
     91          <dependencies>
     92            <dependency>
     93              <!--
     94              https://issues.apache.org/jira/browse/MSITE-724
     95              -->
     96              <groupId>org.apache.maven</groupId>
     97              <artifactId>maven-archiver</artifactId>
     98              <version>2.5</version>
     99            </dependency>
     100          </dependencies>
    84101          <configuration>
    85102            <reportPlugins>
     
    142159                    </reports>
    143160                  </reportSet>
    144                   <!-- reportSet> http://jira.codehaus.org/browse/MPIR-229
     161                  <reportSet>
    145162                    <id>default-modules</id>
    146163                    <reports>
    147164                      <report>modules</report>
    148165                    </reports>
    149                   </reportSet -->
     166                  </reportSet>
    150167                  <reportSet>
    151168                    <id>default-plugins</id>
     
    200217                  <quiet>true</quiet>
    201218                  <breakiterator>true</breakiterator>
    202                   <top><![CDATA[<script type="text/javascript">var _gaq=_gaq||[];_gaq.push(['_setAccount','UA-23230934-1']);_gaq.push(['_trackPageview']);(function(){var ga=document.createElement('script');ga.type='text/javascript';ga.async=true;ga.src=('https:'==document.location.protocol?'https://ssl':'http://www')+'.google-analytics.com/ga.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(ga,s);})();</script>]]></top>
     219                  <top><![CDATA[<script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create', 'UA-23230934-1', 'jomc.org');ga('send', 'pageview');</script>]]></top>
    203220                  <keywords>true</keywords>
    204221                  <linksource>true</linksource>
     
    212229                  <detectLinks>true</detectLinks>
    213230                  <validateLinks>true</validateLinks>
     231                  <minmemory>${maven.javadoc.minmemory}</minmemory>
     232                  <maxmemory>${maven.javadoc.maxmemory}</maxmemory>
    214233                  <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
    215234                  <docletArtifact>
     
    230249                    </tagletArtifact>
    231250                  </tagletArtifacts>
    232                   <additionalJOption>${maven.javadoc.additionalJOption}</additionalJOption>
     251                  <additionalJOptions>
     252                    <additionalJOption>-J-client</additionalJOption>
     253                    <additionalJOption>-J-Dfile.encoding=${file.encoding}</additionalJOption>
     254                  </additionalJOptions>
    233255                  <additionalparam>-inferrel -inferdep -hide java.* -collpackages java.util.* -qualify -postfixpackage -nodefontsize 10 -nodefontpackagesize 8 -outputencoding ${project.reporting.outputEncoding} -inferdepvis protected</additionalparam>
    234256                </configuration>
     
    252274                </reportSets>
    253275              </reportPlugin>
    254               <reportPlugin>
     276              <!-- http://jira.codehaus.org/browse/MTAGLIST-59 reportPlugin>
    255277                <groupId>org.codehaus.mojo</groupId>
    256278                <artifactId>taglist-maven-plugin</artifactId>
     
    278300                  </tagListOptions>
    279301                </configuration>
    280               </reportPlugin>
     302              </reportPlugin -->
    281303              <reportPlugin>
    282304                <groupId>org.apache.maven.plugins</groupId>
     
    358380                </reportSets>
    359381                <configuration>
    360                   <jvmArgs>${mojo.findbugs.jvmArgs}</jvmArgs>
     382                  <fork>false</fork>
    361383                </configuration>
    362384              </reportPlugin>
    363385              <reportPlugin>
    364                 <groupId>org.codehaus.mojo</groupId>
    365                 <artifactId>emma-maven-plugin</artifactId>
     386                <groupId>org.jacoco</groupId>
     387                <artifactId>jacoco-maven-plugin</artifactId>
    366388                <reportSets>
    367389                  <reportSet>
    368                     <id>default-emma</id>
    369                     <reports>
    370                       <report>emma</report>
     390                    <id>default-report</id>
     391                    <reports>
     392                      <report>report</report>
    371393                    </reports>
    372394                  </reportSet>
    373395                </reportSets>
    374                 <configuration>
    375                   <!-- xml>false</xml See http://jira.codehaus.org/browse/MEMMA-19 -->
    376                   <dataFiles>
    377                     <dataFile>${project.build.directory}/coverage.ec</dataFile>
    378                   </dataFiles>
    379                   <sourcePaths>
    380                     <sourcePath>${project.build.sourceDirectory}</sourcePath>
    381                     <sourcePath>${xjcOutputDirectory}</sourcePath>
    382                     <sourcePath>${javaccOutputDirectory}</sourcePath>
    383                   </sourcePaths>
    384                 </configuration>
    385396              </reportPlugin>
    386397              <reportPlugin>
     
    489500          <version>${maven-jarsigner-plugin.artifact.version}</version>
    490501          <configuration>
     502            <excludeClassifiers>
     503              <excludeClassifier>bin</excludeClassifier>
     504            </excludeClassifiers>
     505            <maxMemory>${maven.jarsigner.memory}</maxMemory>
    491506            <arguments>
    492507              <argument>-J-client</argument>
    493               <argument>-J-Xms32m</argument>
    494               <argument>-J-Xmx32m</argument>
    495               <argument>-J-Xss2m</argument>
    496508              <argument>-J-Dfile.encoding=${file.encoding}</argument>
    497509              <argument>-J-Djsse.enableSNIExtension=false</argument>
    498510              <argument>-digestalg</argument>
    499511              <argument>SHA-256</argument>
    500               <argument>-tsa</argument>
    501               <argument>${jarsigner.tsa}</argument>
    502512            </arguments>
    503513          </configuration>
     
    513523          <version>${surefire.version}</version>
    514524          <configuration>
     525            <!--
     526            Cannot set the <argLine> parameter here due to the JaCoCo plugin updating the value of that property after
     527            interpolation.
    515528            <argLine>${maven.surefire.argLine}</argLine>
    516             <forkMode>once</forkMode>
     529            -->
     530            <forkCount>1C</forkCount>
    517531            <redirectTestOutputToFile>true</redirectTestOutputToFile>
    518532            <runOrder>random</runOrder>
     
    541555            <quiet>true</quiet>
    542556            <breakiterator>true</breakiterator>
    543             <top><![CDATA[<script type="text/javascript">var _gaq=_gaq||[];_gaq.push(['_setAccount','UA-23230934-1']);_gaq.push(['_trackPageview']);(function(){var ga=document.createElement('script');ga.type='text/javascript';ga.async=true;ga.src=('https:'==document.location.protocol?'https://ssl':'http://www')+'.google-analytics.com/ga.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(ga,s);})();</script>]]></top>
     557            <top><![CDATA[<script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create', 'UA-23230934-1', 'jomc.org');ga('send', 'pageview');</script>]]></top>
    544558            <keywords>true</keywords>
    545559            <linksource>true</linksource>
     
    553567            <detectLinks>true</detectLinks>
    554568            <validateLinks>true</validateLinks>
     569            <minmemory>${maven.javadoc.minmemory}</minmemory>
     570            <maxmemory>${maven.javadoc.maxmemory}</maxmemory>
    555571            <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
    556572            <docletArtifact>
     
    571587              </tagletArtifact>
    572588            </tagletArtifacts>
    573             <additionalJOption>${maven.javadoc.additionalJOption}</additionalJOption>
     589            <additionalJOptions>
     590              <additionalJOption>-J-client</additionalJOption>
     591              <additionalJOption>-J-Dfile.encoding=${file.encoding}</additionalJOption>
     592            </additionalJOptions>
    574593            <additionalparam>-inferrel -inferdep -hide java.* -collpackages java.util.* -qualify -postfixpackage -nodefontsize 10 -nodefontpackagesize 8 -outputencoding ${project.reporting.outputEncoding} -inferdepvis protected</additionalparam>
    575594            <archive>
     
    605624          <executions>
    606625            <execution>
     626              <id>default-descriptor</id>
     627              <phase>generate-resources</phase>
     628            </execution>
     629            <execution>
    607630              <id>default-helpmojo</id>
    608631              <goals>
     
    665688          <artifactId>maven-enforcer-plugin</artifactId>
    666689          <version>${maven-enforcer-plugin.artifact.version}</version>
     690          <dependencies>
     691            <dependency>
     692              <groupId>org.codehaus.mojo</groupId>
     693              <artifactId>extra-enforcer-rules</artifactId>
     694              <version>1.0-beta-4</version>
     695            </dependency>
     696          </dependencies>
    667697          <executions>
    668698            <execution>
     
    687717              </requireJavaVersion>
    688718              <requireMavenVersion>
    689                 <version>[3.0.4,3.0.6)</version>
     719                <version>[3.0.4],[3.0.5],[3.1.0-alpha-1],[3.1.0],[3.1.1],[3.2.1],[3.2.2],[3.2.3],[3.2.5],[3.3.1],[3.3.3],[3.3.9]</version>
    690720              </requireMavenVersion>
    691               <requireNoRepositories />
     721              <requireNoRepositories/>
     722              <enforceBytecodeVersion>
     723                <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
     724              </enforceBytecodeVersion>
    692725            </rules>
    693726          </configuration>
     
    696729          <groupId>org.apache.maven.plugins</groupId>
    697730          <artifactId>maven-project-info-reports-plugin</artifactId>
    698           <version>${maven-project-info-reports-plugin.artifact.version}</version> <!-- See http://jira.codehaus.org/browse/MPIR-238 -->
     731          <version>${maven-project-info-reports-plugin.artifact.version}</version>
    699732        </plugin>
    700733        <plugin>
     
    714747          <groupId>org.apache.maven.plugins</groupId>
    715748          <artifactId>maven-checkstyle-plugin</artifactId>
    716           <version>${maven-checkstyle-plugin.artifact.version}</version> <!-- See http://sourceforge.net/tracker/?func=detail&aid=3486876&group_id=29721&atid=397078 -->
     749          <version>${maven-checkstyle-plugin.artifact.version}</version>
    717750          <configuration>
    718751            <configLocation>org/jomc/build/resources/checkstyle.xml</configLocation>
     
    798831          <version>${findbugs-maven-plugin.artifact.version}</version>
    799832          <configuration>
    800             <jvmArgs>${mojo.findbugs.jvmArgs}</jvmArgs>
    801           </configuration>
    802         </plugin>
    803         <plugin>
    804           <groupId>org.codehaus.mojo</groupId>
    805           <artifactId>emma-maven-plugin</artifactId>
    806           <version>${emma-maven-plugin.artifact.version}</version>
    807           <configuration>
    808             <!-- xml>false</xml See http://jira.codehaus.org/browse/MEMMA-19 -->
    809             <dataFiles>
    810               <dataFile>${project.build.directory}/coverage.ec</dataFile>
    811             </dataFiles>
    812             <sourcePaths>
    813               <sourcePath>${project.build.sourceDirectory}</sourcePath>
    814               <sourcePath>${xjcOutputDirectory}</sourcePath>
    815               <sourcePath>${javaccOutputDirectory}</sourcePath>
    816             </sourcePaths>
    817           </configuration>
    818         </plugin>
    819         <plugin>
     833            <fork>false</fork>
     834          </configuration>
     835        </plugin>
     836        <plugin>
     837          <groupId>org.jacoco</groupId>
     838          <artifactId>jacoco-maven-plugin</artifactId>
     839          <version>${jacoco-maven-plugin.artifact.version}</version>
     840          <executions>
     841            <execution>
     842              <id>default-prepare-agent</id>
     843              <goals>
     844                <goal>prepare-agent</goal>
     845              </goals>
     846            </execution>
     847          </executions>
     848        </plugin>
     849        <!-- http://jira.codehaus.org/browse/MTAGLIST-59 plugin>
    820850          <groupId>org.codehaus.mojo</groupId>
    821851          <artifactId>taglist-maven-plugin</artifactId>
     
    836866            </tagListOptions>
    837867          </configuration>
    838         </plugin>
     868        </plugin -->
    839869        <plugin>
    840870          <groupId>org.codehaus.plexus</groupId>
     
    914944        <artifactId>animal-sniffer-maven-plugin</artifactId>
    915945      </plugin>
     946      <plugin>
     947        <groupId>org.jacoco</groupId>
     948        <artifactId>jacoco-maven-plugin</artifactId>
     949      </plugin>
    916950    </plugins>
    917951  </build>
     
    933967      <id>sonatype-nexus-staging</id>
    934968      <name>Sonatype Nexus Release Repository</name>
    935       <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
     969      <url>dav:https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
    936970    </repository>
    937971    <snapshotRepository>
    938972      <id>sonatype-nexus-snapshots</id>
    939973      <name>Sonatype Nexus Snapshots</name>
    940       <url>http://oss.sonatype.org/content/repositories/snapshots</url>
     974      <url>dav:https://oss.sonatype.org/content/repositories/snapshots</url>
    941975    </snapshotRepository>
    942976    <site>
     
    960994            <plugin>
    961995              <groupId>org.apache.maven.plugins</groupId>
     996              <artifactId>maven-deploy-plugin</artifactId>
     997              <dependencies>
     998                <dependency>
     999                  <groupId>org.apache.maven.wagon</groupId>
     1000                  <artifactId>wagon-webdav-jackrabbit</artifactId>
     1001                  <version>2.10</version>
     1002                </dependency>
     1003              </dependencies>
     1004            </plugin>
     1005            <plugin>
     1006              <groupId>org.apache.maven.plugins</groupId>
    9621007              <artifactId>maven-site-plugin</artifactId>
    9631008              <dependencies>
    9641009                <dependency>
    9651010                  <groupId>org.apache.maven.wagon</groupId>
    966                   <artifactId>wagon-ssh</artifactId>
    967                   <version>${wagon.version}</version>
    968                 </dependency>
    969                 <dependency>
    970                   <groupId>org.apache.maven.wagon</groupId>
    9711011                  <artifactId>wagon-webdav-jackrabbit</artifactId>
    972                   <version>${wagon.version}</version>
    973                 </dependency>
    974                 <dependency>
    975                   <groupId>org.slf4j</groupId>
    976                   <artifactId>jcl-over-slf4j</artifactId>
    977                   <version>${slf4j.version}</version>
    978                 </dependency>
    979                 <dependency>
    980                   <groupId>org.slf4j</groupId>
    981                   <artifactId>slf4j-simple</artifactId>
    982                   <version>${slf4j.version}</version>
     1012                  <version>2.10</version>
    9831013                </dependency>
    9841014              </dependencies>
     
    9991029                <dependency>
    10001030                  <groupId>org.apache.maven.wagon</groupId>
    1001                   <artifactId>wagon-ssh</artifactId>
    1002                   <version>${wagon.version}</version>
    1003                 </dependency>
    1004                 <dependency>
    1005                   <groupId>org.apache.maven.wagon</groupId>
    10061031                  <artifactId>wagon-webdav-jackrabbit</artifactId>
    1007                   <version>${wagon.version}</version>
    1008                 </dependency>
    1009                 <dependency>
    1010                   <groupId>org.slf4j</groupId>
    1011                   <artifactId>jcl-over-slf4j</artifactId>
    1012                   <version>${slf4j.version}</version>
    1013                 </dependency>
    1014                 <dependency>
    1015                   <groupId>org.slf4j</groupId>
    1016                   <artifactId>slf4j-simple</artifactId>
    1017                   <version>${slf4j.version}</version>
     1032                  <version>1.0</version>
    10181033                </dependency>
    10191034              </dependencies>
     
    12291244  <properties>
    12301245    <!-- Artifact versions. -->
    1231     <animal-sniffer.version>1.9</animal-sniffer.version>
    1232     <surefire.version>2.14</surefire.version>
    1233     <plugintools.version>2.9</plugintools.version> <!-- See http://jira.codehaus.org/browse/MNG-3762 -->
    1234     <plexuscontainers.version>1.5.5</plexuscontainers.version>
    1235     <wagon.version>2.3</wagon.version>
    1236     <slf4j.version>1.6.4</slf4j.version>
    1237     <umlgraph.version>5.6</umlgraph.version>
     1246    <animal-sniffer.version>1.15</animal-sniffer.version>
     1247    <surefire.version>2.19.1</surefire.version>
     1248    <!--
     1249    https://issues.apache.org/jira/browse/MNG-3762
     1250    -->
     1251    <plugintools.version>2.9</plugintools.version>
     1252    <plexuscontainers.version>1.6</plexuscontainers.version>
     1253    <umlgraph.version>5.6.6</umlgraph.version>
    12381254    <cc-xjc-plugin.version>2.0.1</cc-xjc-plugin.version>
    1239     <jaxb2-basics.version>0.6.3</jaxb2-basics.version>
     1255    <jaxb2-basics.version>0.11.0</jaxb2-basics.version>
     1256    <jomc.build.version>1.9</jomc.build.version>
    12401257    <!-- Plugin versions. -->
    1241     <maven-compiler-plugin.artifact.version>3.1</maven-compiler-plugin.artifact.version>
    1242     <maven-site-plugin.artifact.version>3.1</maven-site-plugin.artifact.version> <!-- See http://jira.codehaus.org/browse/MSITE-665 -->
    1243     <maven-resources-plugin.artifact.version>2.6</maven-resources-plugin.artifact.version>
    1244     <maven-release-plugin.artifact.version>2.4.1</maven-release-plugin.artifact.version>
    1245     <maven-jar-plugin.artifact.version>2.4</maven-jar-plugin.artifact.version>
    1246     <maven-gpg-plugin.artifact.version>1.4</maven-gpg-plugin.artifact.version>
    1247     <maven-jarsigner-plugin.artifact.version>1.2</maven-jarsigner-plugin.artifact.version>
    1248     <maven-remote-resources-plugin.artifact.version>1.4</maven-remote-resources-plugin.artifact.version>
    1249     <maven-javadoc-plugin.artifact.version>2.9</maven-javadoc-plugin.artifact.version>
    1250     <maven-clean-plugin.artifact.version>2.5</maven-clean-plugin.artifact.version>
    1251     <maven-deploy-plugin.artifact.version>2.7</maven-deploy-plugin.artifact.version>
    1252     <maven-dependency-plugin.artifact.version>2.7</maven-dependency-plugin.artifact.version>
    1253     <maven-install-plugin.artifact.version>2.4</maven-install-plugin.artifact.version>
    1254     <maven-source-plugin.artifact.version>2.2.1</maven-source-plugin.artifact.version>
    1255     <maven-scm-plugin.artifact.version>1.8.1</maven-scm-plugin.artifact.version>
    1256     <maven-changes-plugin.artifact.version>2.9</maven-changes-plugin.artifact.version>
    1257     <maven-enforcer-plugin.artifact.version>1.2</maven-enforcer-plugin.artifact.version>
    1258     <maven-project-info-reports-plugin.artifact.version>2.6</maven-project-info-reports-plugin.artifact.version>
    1259     <maven-jxr-plugin.artifact.version>2.3</maven-jxr-plugin.artifact.version>
    1260     <maven-pmd-plugin.artifact.version>3.0.1</maven-pmd-plugin.artifact.version>
    1261     <maven-checkstyle-plugin.artifact.version>2.9.1</maven-checkstyle-plugin.artifact.version>
    1262     <wagon-maven-plugin.artifact.version>1.0-beta-4</wagon-maven-plugin.artifact.version>
     1258    <maven-compiler-plugin.artifact.version>3.5.1</maven-compiler-plugin.artifact.version>
     1259    <!--
     1260    https://issues.apache.org/jira/browse/MSITE-724
     1261    https://issues.apache.org/jira/browse/MSITE-769
     1262    -->
     1263    <maven-site-plugin.artifact.version>3.4</maven-site-plugin.artifact.version>
     1264    <maven-resources-plugin.artifact.version>2.7</maven-resources-plugin.artifact.version>
     1265    <maven-release-plugin.artifact.version>2.5.3</maven-release-plugin.artifact.version>
     1266    <maven-jar-plugin.artifact.version>2.6</maven-jar-plugin.artifact.version>
     1267    <maven-gpg-plugin.artifact.version>1.6</maven-gpg-plugin.artifact.version>
     1268    <maven-jarsigner-plugin.artifact.version>1.4</maven-jarsigner-plugin.artifact.version>
     1269    <maven-remote-resources-plugin.artifact.version>1.5</maven-remote-resources-plugin.artifact.version>
     1270    <maven-javadoc-plugin.artifact.version>2.10.3</maven-javadoc-plugin.artifact.version>
     1271    <maven-clean-plugin.artifact.version>3.0.0</maven-clean-plugin.artifact.version>
     1272    <maven-deploy-plugin.artifact.version>2.8.2</maven-deploy-plugin.artifact.version>
     1273    <maven-dependency-plugin.artifact.version>2.10</maven-dependency-plugin.artifact.version>
     1274    <maven-install-plugin.artifact.version>2.5.2</maven-install-plugin.artifact.version>
     1275    <maven-source-plugin.artifact.version>3.0.0</maven-source-plugin.artifact.version>
     1276    <maven-scm-plugin.artifact.version>1.9.4</maven-scm-plugin.artifact.version>
     1277    <maven-changes-plugin.artifact.version>2.11</maven-changes-plugin.artifact.version>
     1278    <maven-enforcer-plugin.artifact.version>1.4.1</maven-enforcer-plugin.artifact.version>
     1279    <!--
     1280    https://issues.apache.org/jira/browse/MPIR-238
     1281    https://issues.apache.org/jira/browse/MPIR-322
     1282        The changes due to MPIR-322 are breaking the plugin for this project. Couldn't get worse.
     1283    -->
     1284    <maven-project-info-reports-plugin.artifact.version>2.7</maven-project-info-reports-plugin.artifact.version>
     1285    <maven-jxr-plugin.artifact.version>2.5</maven-jxr-plugin.artifact.version>
     1286    <maven-pmd-plugin.artifact.version>3.6</maven-pmd-plugin.artifact.version>
     1287    <!--
     1288    http://sourceforge.net/tracker/?func=detail&aid=3486876&group_id=29721&atid=397078
     1289    -->
     1290    <maven-checkstyle-plugin.artifact.version>2.17</maven-checkstyle-plugin.artifact.version>
     1291    <wagon-maven-plugin.artifact.version>1.0</wagon-maven-plugin.artifact.version>
    12631292    <javacc-maven-plugin.artifact.version>2.6</javacc-maven-plugin.artifact.version>
    1264     <build-helper-maven-plugin.artifact.version>1.8</build-helper-maven-plugin.artifact.version>
    1265     <xml-maven-plugin.artifact.version>1.0</xml-maven-plugin.artifact.version>
    1266     <clirr-maven-plugin.artifact.version>2.5</clirr-maven-plugin.artifact.version>
    1267     <findbugs-maven-plugin.artifact.version>2.5.2</findbugs-maven-plugin.artifact.version>
    1268     <emma-maven-plugin.artifact.version>1.0-alpha-3</emma-maven-plugin.artifact.version>
     1293    <build-helper-maven-plugin.artifact.version>1.10</build-helper-maven-plugin.artifact.version>
     1294    <xml-maven-plugin.artifact.version>1.0.1</xml-maven-plugin.artifact.version>
     1295    <clirr-maven-plugin.artifact.version>2.7</clirr-maven-plugin.artifact.version>
     1296    <findbugs-maven-plugin.artifact.version>3.0.3</findbugs-maven-plugin.artifact.version>
     1297    <jacoco-maven-plugin.artifact.version>0.7.6.201602180812</jacoco-maven-plugin.artifact.version>
     1298    <!--
     1299    https://issues.apache.org/jira/browse/MTAGLIST-59
     1300    -->
    12691301    <taglist-maven-plugin.artifact.version>2.4</taglist-maven-plugin.artifact.version>
    1270     <maven-jaxb21-plugin.artifact.version>0.8.3</maven-jaxb21-plugin.artifact.version>
    1271     <maven-shade-plugin.artifact.version>2.0</maven-shade-plugin.artifact.version>
    1272     <maven-assembly-plugin.artifact.version>2.4</maven-assembly-plugin.artifact.version>
     1302    <maven-jaxb21-plugin.artifact.version>0.13.1</maven-jaxb21-plugin.artifact.version>
     1303    <maven-shade-plugin.artifact.version>2.4.3</maven-shade-plugin.artifact.version>
     1304    <maven-assembly-plugin.artifact.version>2.6</maven-assembly-plugin.artifact.version>
    12731305    <!-- Plugin parameters. -->
    12741306    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     
    12801312    <assembly.useJvmChmod>true</assembly.useJvmChmod>
    12811313    <dependency.useJvmChmod>true</dependency.useJvmChmod>
     1314    <installAtEnd>true</installAtEnd>
     1315    <deployAtEnd>true</deployAtEnd>
    12821316    <maven.compiler.optimize>true</maven.compiler.optimize>
    12831317    <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     
    12851319    <maven.compiler.source>1.5</maven.compiler.source>
    12861320    <maven.compiler.target>1.5</maven.compiler.target>
    1287     <maven.javadoc.additionalJOption>-J-client -J-Xms32m -J-Xmx32m -J-Xss2m -J-Dfile.encoding=${file.encoding}</maven.javadoc.additionalJOption>
     1321    <maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
     1322    <maven.jarsigner.memory>32m</maven.jarsigner.memory>
     1323    <maven.javadoc.memory>32m</maven.javadoc.memory>
     1324    <maven.javadoc.minmemory>${maven.javadoc.memory}</maven.javadoc.minmemory>
     1325    <maven.javadoc.maxmemory>${maven.javadoc.memory}</maven.javadoc.maxmemory>
    12881326    <maven.surefire.argLine>-client -Xms32m -Xmx32m -Xss2m -Dfile.encoding=${file.encoding}</maven.surefire.argLine>
    1289     <mojo.findbugs.jvmArgs>-client -Xms32m -Xmx32m -Xss2m -Dfile.encoding=${file.encoding}</mojo.findbugs.jvmArgs>
     1327    <!-- Updated by JaCoCo plugin. Potentionally conflicts with other plugins using that same property. -->
     1328    <argLine>${maven.surefire.argLine}</argLine>
    12901329    <!-- Parent -->
    1291     <jomc.base.version>1.9</jomc.base.version>
     1330    <jomc.base.version>1.10</jomc.base.version>
    12921331    <jomc.frs.distribution.id>frs.jomc.org</jomc.frs.distribution.id>
    12931332    <jomc.frs.distribution.url>dav:http://frs.jomc.org/</jomc.frs.distribution.url>
  • jomc-build/trunk/src/site/site.xml

    r4621 r5073  
    22<!--
    33
    4   Copyright (C) Christian Schulte, 2005-206
     4  Copyright (C) Christian Schulte <cs@schulte.it>, 2005-206
    55  All rights reserved.
    66
     
    3636  <skin>
    3737    <groupId>org.apache.maven.skins</groupId>
    38     <artifactId>maven-classic-skin</artifactId>
    39     <version>1.1</version>
     38    <artifactId>maven-fluido-skin</artifactId>
     39    <version>1.4</version>
    4040  </skin>
    4141  <bannerLeft>
    4242    <name>JOMC</name>
    43     <src>http://www.jomc.org/jomc.org.wht.png</src>
     43    <src>http://www.jomc.org/jomc.org.png</src>
    4444    <href>http://www.jomc.org</href>
    4545  </bannerLeft>
    4646  <poweredBy>
    47     <logo name="SCHULTE.IT" href="http://www.schulte.it" img="http://www.schulte.it/resources/schulte.it.png"/>
     47    <logo name="Christian Schulte" href="http://www.schulte.it" img="http://www.schulte.it/resources/schulte.it.png"/>
    4848  </poweredBy>
    4949  <googleAdSenseClient>ca-pub-2363332114228707</googleAdSenseClient>
     
    5252  <body>
    5353    <head>
    54       <script type="text/javascript"><![CDATA[<!--
    55 google_ad_client = "ca-pub-2363332114228707";
    56 /* JOMC */
    57 google_ad_slot = "0169973943";
    58 google_ad_width = 728;
    59 google_ad_height = 90;
     54      <script>
     55<![CDATA[
     56(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     57(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
     58m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     59})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
    6060
    61 var _gaq = _gaq || [];
    62 _gaq.push(['_setAccount', 'UA-23230934-1']);
    63 _gaq.push(['_trackPageview']);
    64 
    65 (function() {
    66   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
    67   ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
    68   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
    69 })();
    70 //-->]]>
     61ga('create', 'UA-23230934-1', 'jomc.org');
     62ga('require', 'displayfeatures');
     63ga('send', 'pageview');
     64]]>
    7165      </script>
    7266    </head>
Note: See TracChangeset for help on using the changeset viewer.