WELD-623, and cleanup after upgrade to weld parent 17

weld · Aug 18, 2010 · 4202bd8 · 4202bd8
1 parent 6a3a9cc
commit 4202bd8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 32 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.jboss.weld</groupId>
       <artifactId>weld-parent</artifactId>
-      <version>16</version>
+      <version>17</version>
       <relativePath />
   </parent>
 

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -173,36 +173,22 @@
             </configuration>
          </plugin>
          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-               <archive>
-                  <manifestEntries>
-                     <Implementation-URL>${project.url}</Implementation-URL>
-                     <Implementation-Title>${project.name}</Implementation-Title>
-                     <Implementation-Version>${maven.build.timestamp}</Implementation-Version>
-                     <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-                     <Specification-Title>${project.name}</Specification-Title>
-                     <Specification-Version>${parsedVersion.osgiVersion}</Specification-Version>
-                     <Specification-Vendor>${project.organization.name}</Specification-Vendor>
-                  </manifestEntries>
-                  <manifestSections>
-                     <manifestSection>
-                        <name>Build-Information</name>
-                        <manifestEntries>
-                           <Maven-Version>${maven.version}</Maven-Version>
-                           <Java-Version>${java.version}</Java-Version>
-                           <Java-Vendor>${java.vendor}</Java-Vendor>
-                           <Os-Name>${os.name}</Os-Name>
-                           <Os-Arch>${os.arch}</Os-Arch>
-                           <Os-Version>${os.version}</Os-Version>
-                           <SCM>r${buildNumber}</SCM>
-                           <Build-Time>${maven.build.timestamp}</Build-Time>
-                        </manifestEntries>
-                     </manifestSection>
-                  </manifestSections>
-               </archive>
-            </configuration>
+            <artifactId>maven-remote-resources-plugin</artifactId>
+            <version>1.1</version>
+            <executions>
+               <execution>
+                  <id>attach-license</id>
+                  <goals>
+                     <goal>process</goal>
+                  </goals>
+                  <inherited>true</inherited>
+                  <configuration>
+                     <resourceBundles>
+                        <resourceBundle>org.jboss.weld:weld-license:1-SNAPSHOT</resourceBundle>
+                     </resourceBundles>
+                  </configuration>
+               </execution>
+            </executions>
          </plugin>
       </plugins>
    </build>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.jboss.weld</groupId>
       <artifactId>weld-parent</artifactId>
-      <version>16</version>
+      <version>17</version>
    </parent>
 
    <name>Weld Build Aggregator</name>