You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/10/14 12:52:02 UTC
svn commit: r1631714 - in /tomee/tomee/trunk:
maven/tomee-maven-plugin/pom.xml pom.xml
server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
tomee/apache-tomee/pom.xml
Author: andygumbrecht
Date: Tue Oct 14 10:52:01 2014
New Revision: 1631714
URL: http://svn.apache.org/r1631714
Log:
Remove *.exe filter (now global)
Do not use version in module
Modified:
tomee/tomee/trunk/maven/tomee-maven-plugin/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
tomee/tomee/trunk/tomee/apache-tomee/pom.xml
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/pom.xml?rev=1631714&r1=1631713&r2=1631714&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/pom.xml (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/pom.xml Tue Oct 14 10:52:01 2014
@@ -65,12 +65,10 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.5</version>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1631714&r1=1631713&r2=1631714&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Tue Oct 14 10:52:01 2014
@@ -1847,6 +1847,11 @@
<version>1.8.1</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>2.4.4</version>
+ </dependency>
+ <dependency>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
<version>${commons-lang3.version}</version>
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java?rev=1631714&r1=1631713&r2=1631714&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java Tue Oct 14 10:52:01 2014
@@ -29,12 +29,12 @@ public class Activator implements Bundle
private ServiceManagerExtender manager;
private ServiceRegistration registration;
- public void start(BundleContext bundleContext) throws Exception {
+ public void start(final BundleContext bundleContext) throws Exception {
manager = new ServiceManagerExtender(bundleContext);
registration = bundleContext.registerService(ServiceManager.class.getName(), manager, null);
}
- public void stop(BundleContext bundleContext) throws Exception {
+ public void stop(final BundleContext bundleContext) throws Exception {
if (manager != null) {
manager.shutdown();
}
Modified: tomee/tomee/trunk/tomee/apache-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/pom.xml?rev=1631714&r1=1631713&r2=1631714&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/pom.xml Tue Oct 14 10:52:01 2014
@@ -115,16 +115,10 @@
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
- <excludes>
- <exclude>**/*.exe</exclude>
- </excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
- <includes>
- <include>**/*.exe</include>
- </includes>
</resource>
</resources>