reverting unintended changes by the maven release plugin. Ugh.

oaeproject · Dec 13, 2011 · a1fac19 · a1fac19
1 parent ffa99fd
commit a1fac19
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/build.xml b/build.xml
@@ -255,7 +255,7 @@
     <!-- Target: Hash files-->
     <target name="hash_files" depends="copy_optimized">
       <!-- hashfiles jar gets put here by maven -->
-      <java jar="${settings.localRepository}/org/sakaiproject/nakamura/org.sakaiproject.nakamura.hashfiles/1.1/org.sakaiproject.nakamura.hashfiles-1.1.jar"
+      <java jar="${settings.localRepository}/org/sakaiproject/nakamura/org.sakaiproject.nakamura.hashfiles/1.1-SNAPSHOT/org.sakaiproject.nakamura.hashfiles-1.1-SNAPSHOT.jar"
         fork="true">
             <arg value="${HASHTOOL_DIR}/config.properties" />
         </java>

diff --git a/pom-bundle.xml b/pom-bundle.xml
@@ -10,12 +10,13 @@
     implied. See the License for the * specific language governing permissions and limitations under
     the License.
   -->
-<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">
+<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>org.sakaiproject.nakamura</groupId>
   <artifactId>org.sakaiproject.nakamura.uxloader</artifactId>
   <packaging>bundle</packaging>
-  <version>1.1</version>
+  <version>1.1-SNAPSHOT</version>
   <name>Sakai 3 UX Loader</name>
   <description>Loads the Sakai 3 UI into the JCR</description>
   <url>http://github.com/sakaiproject/3akai-ux</url>
@@ -128,15 +129,15 @@
       <!-- Begin workaround for maven-bundle-plugin 2.0.1 ignoring processed resources. -->
       <properties>
         <ant.target>release</ant.target>
-        <dev.content />
+        <dev.content></dev.content>
       </properties>
     </profile>
     <profile>
       <id>sakai-development</id>
       <!-- Begin workaround for maven-bundle-plugin 2.0.1 ignoring processed resources. -->
       <properties>
         <ant.target>development</ant.target>
-        <dev.content />
+        <dev.content></dev.content>
       </properties>
     </profile>
     <profile>
@@ -146,7 +147,7 @@
          <plugin>
           <groupId>org.apache.sling</groupId>
           <artifactId>maven-sling-plugin</artifactId>
-          <version>2.0.6</version>
+          <version>2.0.5-SNAPSHOT</version>
           <executions>
             <execution>
               <id>install-bundle</id>
@@ -310,13 +311,13 @@
             <phase>initialize</phase>
             <configuration>
               <target>
-                <exec outputproperty="git.version" executable="git" failifexecutionfails="false" searchpath="true">
+                <exec outputproperty="git.version" executable="git" failifexecutionfails="false" searchpath="true" >
                   <arg line="describe" />
                 </exec>
-                <condition property="git.version.value" value="${git.version}" else="UnknownVersion">
+                <condition property="git.version.value" value="${git.version}" else="UnknownVersion" >
                   <isset property="git.version" />
                 </condition>
-                <echo file="${basedir}/target/scm-version.properties">
+                <echo file="${basedir}/target/scm-version.properties" >
                   scm.version=${git.version.value}
                 </echo>
               </target>
@@ -337,7 +338,7 @@
           <dependency>
             <groupId>org.sakaiproject.nakamura</groupId>
             <artifactId>org.sakaiproject.nakamura.hashfiles</artifactId>
-            <version>1.1</version>
+            <version>1.1-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -347,7 +348,7 @@
     <dependency>
       <groupId>org.sakaiproject.nakamura</groupId>
       <artifactId>org.sakaiproject.nakamura.hashfiles</artifactId>
-      <version>1.1</version>
+      <version>1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -10,18 +10,19 @@
     implied. See the License for the * specific language governing permissions and limitations under
     the License.
   -->
-<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">
+<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>org.sakaiproject.nakamura</groupId>
   <artifactId>org.sakaiproject.nakamura.uxloader-wrap</artifactId>
   <packaging>pom</packaging>
-  <version>1.1</version>
+  <version>1.1-SNAPSHOT</version>
   <name>Sakai 3 UX Loader Wrapper</name>
   <description>Loads the Sakai 3 UI into the JCR</description>
   <url>http://github.com/sakaiproject/3akai-ux</url>
   <scm>
     <connection>scm:git:git://github.com/sakaiproject/3akai-ux.git</connection>
-    <developerConnection>scm:git:git@github.com:sakaiproject/3akai-ux.git</developerConnection>
+    <developerConnection>scm:git:git://git@github.com/sakaiproject/3akai-ux.git</developerConnection>
     <url>http://github.com/sakaiproject/3akai-ux/</url>
   </scm>
   <issueManagement>

diff --git a/tools/hashfiles/pom.xml b/tools/hashfiles/pom.xml
@@ -10,12 +10,14 @@
     implied. See the License for the * specific language governing permissions and limitations under
     the License.
   -->
-<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">
+<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>org.sakaiproject.nakamura</groupId>
     <artifactId>org.sakaiproject.nakamura.hashfiles</artifactId>
     <packaging>jar</packaging>
-    <version>1.1</version>
+    <version>1.1-SNAPSHOT</version>
     <name>Sakai 3 UX File Hasher</name>
     <description>Hashes files and appends the hash to the name to trigger proper caching</description>
     <build>