Changeset 34:13ee0b63a092


Ignore:
Timestamp:
05/30/12 00:01:47 (12 months ago)
Author:
David Soergel <dev@davidsoergel.com>
Branch:
default
Message:

update basepom

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • conja.iml

    r33 r34  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> 
    3   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> 
     3  <component name="NewModuleRootManager" inherit-compiler-output="false"> 
    44    <output url="file://$MODULE_DIR$/target/classes" /> 
    55    <output-test url="file://$MODULE_DIR$/target/test-classes" /> 
    … …  
    1212    <orderEntry type="inheritedJdk" /> 
    1313    <orderEntry type="sourceFolder" forTests="false" /> 
    14     <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:jdk15:5.9" level="project" /> 
    15     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" /> 
    16     <orderEntry type="library" name="Maven: log4j:log4j:1.2.13" level="project" /> 
    17     <orderEntry type="library" name="Maven: com.intellij:annotations:7.0.3" level="project" /> 
    1814  </component> 
    1915</module> 

  • pom.xml

    r31 r34  
    3434<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    3535         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
    36   <modelVersion>4.0.0</modelVersion> 
    37   <groupId>com.davidsoergel</groupId> 
    38   <artifactId>conja</artifactId> 
     36    <modelVersion>4.0.0</modelVersion> 
     37    <groupId>com.davidsoergel</groupId> 
     38    <artifactId>conja</artifactId> 
    3939 
    40   <name>conja</name> 
    41   <version>1.06-SNAPSHOT</version> 
    42   <url>http://dev.davidsoergel.com/conja</url> 
    43   <description>Incredibly easy functional concurrency in Java</description> 
     40    <name>conja</name> 
     41    <version>1.06-SNAPSHOT</version> 
     42    <url>http://dev.davidsoergel.com/conja</url> 
     43    <description>Incredibly easy functional concurrency in Java</description> 
    4444 
    45   <parent> 
    46     <groupId>com.davidsoergel</groupId> 
    47     <artifactId>basepom</artifactId> 
    48     <version>0.95</version> 
    49   </parent> 
     45    <parent> 
     46        <groupId>com.davidsoergel</groupId> 
     47        <artifactId>basepom</artifactId> 
     48        <version>0.98</version> 
     49    </parent> 
    5050 
    51   <inceptionYear>2006</inceptionYear> 
     51    <inceptionYear>2006</inceptionYear> 
    5252 
    53   <packaging>jar</packaging> 
     53    <packaging>jar</packaging> 
    5454 
    55   <issueManagement> 
    56     <system>Trac</system> 
    57     <url>http://dev.davidsoergel.com/conja/</url> 
    58   </issueManagement> 
     55    <issueManagement> 
     56        <system>Trac</system> 
     57        <url>http://dev.davidsoergel.com/conja/</url> 
     58    </issueManagement> 
    5959 
    60   <scm> 
    61     <connection>scm:svn:http://svn.davidsoergel.com/repos/conja</connection> 
    62     <developerConnection>scm:svn:svn+ssh://svn.davidsoergel.com/home/svn/repos-ds/conja</developerConnection> 
    63   </scm> 
     60    <scm> 
     61        <connection>scm:svn:http://svn.davidsoergel.com/repos/conja</connection> 
     62        <developerConnection>scm:svn:svn+ssh://svn.davidsoergel.com/home/svn/repos-ds/conja</developerConnection> 
     63    </scm> 
    6464 
    65   <distributionManagement> 
    66     <site> 
    67       <id>website</id> 
    68       <url>scpexe://jenkins@dev.davidsoergel.com/home/build/mavensites/conja</url> 
    69     </site> 
    70   </distributionManagement> 
     65    <distributionManagement> 
     66        <site> 
     67            <id>website</id> 
     68            <url>scpexe://jenkins@dev.davidsoergel.com/home/build/mavensites/conja</url> 
     69        </site> 
     70    </distributionManagement> 
    7171 
     72    <properties> 
     73        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 
     74    </properties> 
    7275 
    73   <repositories> 
    74     <repository> 
    75       <id>central</id> 
    76       <url>http://dev.davidsoergel.com/artifactory/repo</url> 
    77       <snapshots> 
    78         <enabled>false</enabled> 
    79       </snapshots> 
    80     </repository> 
    81     <repository> 
    82       <id>snapshots</id> 
    83       <url>http://dev.davidsoergel.com/artifactory/repo</url> 
    84       <releases> 
    85         <enabled>false</enabled> 
    86       </releases> 
    87     </repository> 
    88   </repositories> 
     76    <repositories> 
     77        <repository> 
     78            <id>dev.davidsoergel.com</id> 
     79            <url>http://dev.davidsoergel.com/nexus/content/groups/public/</url> 
     80        </repository> 
     81    </repositories> 
    8982 
    90   <!--  <dependencies> 
    91       <dependency> 
    92         <groupId>com.google.collections</groupId> 
    93         <artifactId>google-collections</artifactId> 
    94         <version>1.0-rc2</version> 
    95         <scope>compile</scope> 
    96       </dependency> 
    97     </dependencies> --> 
     83    <!--  <dependencies> 
     84     <dependency> 
     85       <groupId>com.google.collections</groupId> 
     86       <artifactId>google-collections</artifactId> 
     87       <version>1.0-rc2</version> 
     88       <scope>compile</scope> 
     89     </dependency> 
     90   </dependencies> --> 
    9891 
    9992</project> 
Note: See TracChangeset for help on using the changeset viewer.