SAK-33299 - Re-release wordcount/autosave because of 12-SNAPSHOT prob…

…lem (sakaiproject#4752)
rifqioe · Aug 31, 2017 · b7c38d2 · b7c38d2
1 parent b70a527
commit b7c38d2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 25 deletions.
diff --git a/master/pom.xml b/master/pom.xml
@@ -143,12 +143,10 @@
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <!-- Default empty unless profile activation -->
     <random-source></random-source>
-    <!-- Either use a tag or a SHA so the version is predictable.
-         If you update this you must also currently update the value inlibrary/src/webapp/editor/ckeditor.launch.js
-         Source at https://github.com/w8tcha/CKEditor-AutoSave-Plugin -->
-    <ckeditor.autosave.version>b88e3878f0c7442a52e542f67e76d97e2ce32f80</ckeditor.autosave.version>
-    <!-- Source at https://github.com/w8tcha/CKEditor-WordCount-Plugin -->
-    <ckeditor.wordcount.version>b29a29d4dc8a42732ce46720e1efc30c826e4c93</ckeditor.wordcount.version>
+
+    <!-- These should only be updated when the webjars version is updated -->
+    <ckeditor.autosave.version>b88e3878f0c7442a52e542f67e76d97e2ce32f8</ckeditor.autosave.version>
+    <ckeditor.wordcount.version>b29a29d4dc8a42732ce46720e1efc30c826e4c9</ckeditor.wordcount.version>
     <ckeditor.a11ychecker.version>1.1.0</ckeditor.a11ychecker.version>
     <ckeditor.balloonpanel.version>4.6.2</ckeditor.balloonpanel.version>
   </properties>

diff --git a/webjars/ckeditor-autosave/pom.xml b/webjars/ckeditor-autosave/pom.xml
@@ -3,23 +3,28 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>webjars</artifactId>
-        <groupId>org.sakaiproject.webjars</groupId>
-        <version>13-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>9</version>
     </parent>
 
     <packaging>jar</packaging>
     <groupId>org.sakaiproject.webjars</groupId>
     <artifactId>ckeditor-autosave</artifactId>
-    <version>${ckeditor.autosave.version}</version>
     <name>CKEditor-autosave-webjar</name>
     <description>WebJar for CKEditor-autosave</description>
     <url>http://webjars.org</url>
 
+    <!-- You must keep these synced in master so they're picked up correctly in library -->
+    <!-- They're separate here so this can be released independently of the rest of Sakai -->
+    <!-- Either use a tag or a SHA so the version is predictable. -->
+    <!-- Source at https://github.com/w8tcha/CKEditor-AutoSave-Plugin -->
+
+    <version>b88e3878f0c7442a52e542f67e76d97e2ce32f8</version>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <upstream.version>${ckeditor.autosave.version}</upstream.version>
+        <upstream.version>${project.version}</upstream.version>
         <upstream.url>https://github.com/w8tcha/CKEditor-AutoSave-Plugin/archive/${upstream.version}</upstream.url>
         <destDir>${project.build.outputDirectory}/META-INF/resources/webjars/autosave/${upstream.version}</destDir>
         <requirejs>
@@ -60,11 +65,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
-
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -73,7 +73,7 @@
                 <configuration>
                     <serverId>sonatype-nexus-staging</serverId>
                     <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/webjars/ckeditor-wordcount/pom.xml b/webjars/ckeditor-wordcount/pom.xml
@@ -3,23 +3,27 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>webjars</artifactId>
-        <groupId>org.sakaiproject.webjars</groupId>
-        <version>13-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>9</version>
     </parent>
 
     <packaging>jar</packaging>
     <groupId>org.sakaiproject.webjars</groupId>
     <artifactId>ckeditor-wordcount</artifactId>
-    <version>${ckeditor.wordcount.version}</version>
     <name>CKEditor-wordcount-webjar</name>
     <description>WebJar for CKEditor-wordcount</description>
     <url>http://webjars.org</url>
 
+    <!-- You must keep these synced in master so they're picked up correctly in library -->
+    <!-- They're separate here so this can be released independently of the rest of Sakai -->
+    <!-- Either use a tag or a SHA so the version is predictable. -->
+    <!-- Source at https://github.com/w8tcha/CKEditor-WordCount-Plugin -->
+    <version>b29a29d4dc8a42732ce46720e1efc30c826e4c9</version>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <upstream.version>${ckeditor.wordcount.version}</upstream.version>
+        <upstream.version>${project.version}</upstream.version>
         <upstream.url>https://github.com/w8tcha/CKEditor-WordCount-Plugin/archive/${upstream.version}</upstream.url>
         <destDir>${project.build.outputDirectory}/META-INF/resources/webjars/wordcount/${upstream.version}</destDir>
         <requirejs>
@@ -31,6 +35,7 @@
         </requirejs>
     </properties>
 
+
     <build>
         <plugins>
             <plugin>
@@ -73,7 +78,7 @@
                 <configuration>
                     <serverId>sonatype-nexus-staging</serverId>
                     <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/webjars/pom.xml b/webjars/pom.xml
@@ -11,6 +11,12 @@
   <groupId>org.sakaiproject.webjars</groupId>
   <artifactId>webjars</artifactId>
   <packaging>pom</packaging>
+  <!-- You must keep these synced in master so they're picked up correctly in library -->
+  <!-- They're separate here so this can be released independently of the rest of Sakai -->
+  <properties>
+    <ckeditor.a11ychecker.version>1.1.0</ckeditor.a11ychecker.version>
+    <ckeditor.balloonpanel.version>4.6.2</ckeditor.balloonpanel.version>
+  </properties>
   <!-- Only build these during the release -->
   <profiles>
       <profile>