[java-parent-project COMMIT] in /trunk: bin/lock-version-common.sh bin/monolithic-lock-version.sh bin/multimodule-loc...

[noreply at shibboleth.net]

Author: lajoie
Date: Thu Oct 20 16:49:46 2011
New Revision: 17

URL: http://svn.shibboleth.net/view/java-parent-project?rev=17&view=rev
Log:
move to model where all references to the parent project are to the trunk
provide script that allows one to "lock" a project to a particular parent project version - script would be used just prior to release of referencing project

Added:
    trunk/bin/lock-version-common.sh   (with props)
    trunk/bin/monolithic-lock-version.sh
    trunk/bin/multimodule-lock-version.sh   (with props)
Modified:
    trunk/pom.xml
    trunk/resources/eclipse/.checkstyle
    trunk/resources/maven/assembly-bin.xml
    trunk/resources/maven/pom.xml.tmpl
    trunk/resources/svn/externals.svn

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-parent-project/trunk/pom.xml?rev=17&r1=16&r2=17&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Oct 20 16:49:46 2011
@@ -6,7 +6,7 @@
 
     <groupId>net.shibboleth</groupId>
     <artifactId>parent</artifactId>
-    <version>2</version>
+    <version>TRUNK-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Shibboleth Project Super POM</name>

Modified: trunk/resources/eclipse/.checkstyle
URL: http://svn.shibboleth.net/view/java-parent-project/trunk/resources/eclipse/.checkstyle?rev=17&r1=16&r2=17&view=diff
==============================================================================
--- trunk/resources/eclipse/.checkstyle (original)
+++ trunk/resources/eclipse/.checkstyle Thu Oct 20 16:49:46 2011
@@ -2,15 +2,14 @@
 
 <fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
 
-   <local-check-config name="Shibboleth Checkstyle" type="remote" description="" 
-                       location="https://svn.shibboleth.net/java-parent-project/tags/1/resources/checkstyle/checkstyle.xml" >
+  <local-check-config name="Shibboleth Checkstyle" location="https://svn.shibboleth.net/java-parent-project/trunk/resources/checkstyle/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="true"/>
     <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
     <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
   </local-check-config>
- 
+  
   <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
     <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
   </fileset>
   
-</fileset-config>
+</fileset-config>

Modified: trunk/resources/maven/assembly-bin.xml
URL: http://svn.shibboleth.net/view/java-parent-project/trunk/resources/maven/assembly-bin.xml?rev=17&r1=16&r2=17&view=diff
==============================================================================
--- trunk/resources/maven/assembly-bin.xml (original)
+++ trunk/resources/maven/assembly-bin.xml Thu Oct 20 16:49:46 2011
@@ -50,4 +50,4 @@
         
 	</fileSets>
 
-</assembly>
+</assembly>

Modified: trunk/resources/maven/pom.xml.tmpl
URL: http://svn.shibboleth.net/view/java-parent-project/trunk/resources/maven/pom.xml.tmpl?rev=17&r1=16&r2=17&view=diff
==============================================================================
--- trunk/resources/maven/pom.xml.tmpl (original)
+++ trunk/resources/maven/pom.xml.tmpl Thu Oct 20 16:49:46 2011
@@ -6,8 +6,8 @@
 
     <parent>
         <groupId>net.shibboleth</groupId>
-        <artifactId>master</artifactId>
-        <version>1</version>
+        <artifactId>parent</artifactId>
+        <version>TRUNK-SNAPSHOT</version>
     </parent>
 
     <name>${project.name}</name>

Modified: trunk/resources/svn/externals.svn
URL: http://svn.shibboleth.net/view/java-parent-project/trunk/resources/svn/externals.svn?rev=17&r1=16&r2=17&view=diff
==============================================================================
--- trunk/resources/svn/externals.svn (original)
+++ trunk/resources/svn/externals.svn Thu Oct 20 16:49:46 2011
@@ -1,1 +1,1 @@
-/java-parent-project/tags/1/resources/eclipse/.settings .settings
+/java-parent-project/trunk/resources/eclipse/.settings .settings