update for BTrace 1.3.7

btraceio · May 10, 2016 · 8046b0d · 8046b0d
1 parent 4250fea
commit 8046b0d
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 35 deletions.
diff --git a/btrace-maven-plugin/pom.xml b/btrace-maven-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
 	<groupId>io.btrace</groupId>
 	<artifactId>btrace-maven</artifactId>
-	<version>1.3.6.1</version>
+	<version>1.3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.btrace</groupId>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>com.sun.tools.btrace</groupId>
             <artifactId>btrace-client</artifactId>
-            <version>1.3.6</version>
+            <version>1.3.7</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>

diff --git a/btrace-maven-plugin/src/main/java/io/btrace/mvnplugin/BTracec.java b/btrace-maven-plugin/src/main/java/io/btrace/mvnplugin/BTracec.java
@@ -5,9 +5,9 @@
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
+ * published by the Free Software Foundation.  Copyright owner designates
+ * this particular file as subject to the "Classpath" exception as provided
+ * by the owner in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

diff --git a/btrace-project-archetype/pom.xml b/btrace-project-archetype/pom.xml
@@ -3,7 +3,7 @@
     <parent>
 	<groupId>io.btrace</groupId>
 	<artifactId>btrace-maven</artifactId>
-	<version>1.3.6.1</version>
+	<version>1.3.7.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/btrace-project-archetype/src/main/resources/META-INF/maven/archetype.xml b/btrace-project-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -1,6 +1,7 @@
 <archetype>
     <id>btrace-project-archetype</id>
-    <sources>
-	<source>src/main/java/AllMethods.java</source>
-    </sources>
+    <resources>
+        <resource>src/main/btrace/AllMethods.java</resource>
+        <resource>src/main/btrace/agent.properties</resource>
+    </resources>
 </archetype>
diff --git a/btrace-project-archetype/src/main/resources/archetype-resources/pom.xml b/btrace-project-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,41 +1,69 @@
 <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">
+         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>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
 
     <properties>
-	<btrace.plugin.version>1.3.6.1</btrace.plugin.version>
+        <btrace.plugin.version>1.3.7.1</btrace.plugin.version>
     </properties>
 
     <dependencies>
-	<dependency>
+        <dependency>
             <groupId>io.btrace</groupId>
             <artifactId>btrace-maven-plugin</artifactId>
             <version>${btrace.plugin.version}</version>
         </dependency>
-	<dependency>
-	    <groupId>junit</groupId>
-	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
-	</dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
-	<plugins>
-	    <plugin>
-		<groupId>io.btrace</groupId>
-		<artifactId>btrace-maven-plugin</artifactId>
-		<version>${btrace.plugin.version}</version>
-		<executions>
-		    <execution>
-			<goals>
-			    <goal>btracec</goal>
-			</goals>
-		    </execution>
-		</executions>
-	    </plugin>
-	</plugins>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.7</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/META-INF/btrace</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>\${basedir}/src/main/btrace</directory>
+                                    <includes>
+                                        <include>agent.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.btrace</groupId>
+                <artifactId>btrace-maven-plugin</artifactId>
+                <version>${btrace.plugin.version}</version>
+                <configuration>
+                    <sourceDirectory>\${basedir}/src/main/btrace</sourceDirectory>
+                    <outputDirectory>${project.build.outputDirectory}/META-INF/btrace</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>btracec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/...e-resources/src/main/java/AllMethods.java → ...resources/src/main/btrace/AllMethods.java b/...e-resources/src/main/java/AllMethods.java → ...resources/src/main/btrace/AllMethods.java
diff --git a/...project-archetype/src/main/resources/archetype-resources/src/main/btrace/agent.properties b/...project-archetype/src/main/resources/archetype-resources/src/main/btrace/agent.properties
@@ -0,0 +1 @@
+debug = true
diff --git a/pom.xml b/pom.xml
@@ -18,21 +18,21 @@
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-            <id>bintray-jbachorik-maven</id>
+            <id>bintray-btraceio-maven</id>
             <name>bintray</name>
             <url>https://api.bintray.com/maven/btraceio/maven/btrace-maven/;publish=1</url>
         </repository>
     </distributionManagement>
     <scm>
         <connection>https://github.com/btraceio/btrace-maven.git</connection>
         <url>https://github.com/btraceio/btrace-maven</url>
-        <tag>1.3.6.1</tag>
+        <tag>1.3.7.1</tag>
     </scm>
     <groupId>io.btrace</groupId>
     <artifactId>btrace-maven</artifactId>
     <packaging>pom</packaging>
     <name>BTrace Maven Support</name>
-    <version>1.3.6.1</version>
+    <version>1.3.7.1</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -91,6 +91,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>2.4</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -103,6 +104,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>