[java-identity-provider COMMIT] in /trunk: idp-core/pom.xml idp-core/src/main/java/net/shibboleth/idp/Version.java id...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jul 18 17:29:42 2014
New Revision: 6309

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6309&view=rev
Log:
Revert Version code to rely on manifest, move maven plugin invocation to idp-core

Modified:
    trunk/idp-core/pom.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/Version.java
    trunk/idp-parent/pom.xml

Modified: trunk/idp-core/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/pom.xml?rev=6309&r1=6308&r2=6309&view=diff
==============================================================================
--- trunk/idp-core/pom.xml (original)
+++ trunk/idp-core/pom.xml Fri Jul 18 17:29:42 2014
@@ -67,4 +67,35 @@
 
     </dependencies>
     
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <archive>
+                                <index>true</index>
+                                <manifestEntries>
+                                    <Main-Class>net.shibboleth.idp.Version</Main-Class>
+                                </manifestEntries>
+                                <manifestSections>
+                                    <manifestSection>
+                                        <name>net/shibboleth/idp</name>
+                                        <manifestEntries>
+                                            <Implementation-Title>${project.artifactId}</Implementation-Title>
+                                            <Implementation-Version>${project.version}</Implementation-Version>
+                                            <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
+                                        </manifestEntries>
+                                    </manifestSection>
+                                </manifestSections>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
 </project>

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/Version.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/Version.java?rev=6309&r1=6308&r2=6309&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/Version.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/Version.java Fri Jul 18 17:29:42 2014
@@ -86,9 +86,7 @@
     }
 
     static {
-        // TODO: this doesn't work at the moment.
-        //VERSION = Version.class.getPackage().getImplementationVersion();
-        VERSION = "3.0.0";
+        VERSION = Version.class.getPackage().getImplementationVersion();
         String[] versionParts = VERSION.split("\\.");
         MAJOR_VERSION = Integer.parseInt(versionParts[0]);
         MINOR_VERSION = Integer.parseInt(versionParts[1]);

Modified: trunk/idp-parent/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-parent/pom.xml?rev=6309&r1=6308&r2=6309&view=diff
==============================================================================
--- trunk/idp-parent/pom.xml (original)
+++ trunk/idp-parent/pom.xml Fri Jul 18 17:29:42 2014
@@ -193,35 +193,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <configuration>
-                            <archive>
-                                <index>true</index>
-                                <manifestEntries>
-                                    <Main-Class>net.shibboleth.idp.Version</Main-Class>
-                                </manifestEntries>
-                                <manifestSections>
-                                    <manifestSection>
-                                        <name>net/shibboleth/idp</name>
-                                        <manifestEntries>
-                                            <Implementation-Title>${project.artifactId}</Implementation-Title>
-                                            <Implementation-Version>${project.version}</Implementation-Version>
-                                            <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
-                                        </manifestEntries>
-                                    </manifestSection>
-                                </manifestSections>
-                            </archive>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>