Get rid of build-config, use common checkstyle config.

weld · Mar 10, 2013 · c3a1c8a · c3a1c8a
1 parent e23eb48
commit c3a1c8a
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 131 deletions.
diff --git a/build-config/pom.xml b/build-config/pom.xml
diff --git a/build-config/src/main/resources/weld-checkstyle/checkstyle.xml b/build-config/src/main/resources/weld-checkstyle/checkstyle.xml
diff --git a/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties b/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
@@ -96,7 +96,7 @@ INJECTED_FIELD_CANNOT_BE_PRODUCER=Injected field {0} cannot be annotated @Produc
 GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT=Session bean with generic class {0} must be @Depedent scope
 PRODUCER_FIELD_ON_SESSION_BEAN_MUST_BE_STATIC=Producer fields on session beans must be static. Field {0} declared on {1}
 PRODUCER_METHOD_WITH_TYPE_VARIABLE_RETURN_TYPE_MUST_BE_DEPENDENT=A producer method with a parameterized return type with a type variable must be declared @Dependent scoped. Method {0}
-PRODUCER_METHOD_CANNOT_HAVE_A_WILDCARD_RETURN_TYPE=A producer method cannot have a return type parameterized with wildcards. Method {0}  
+PRODUCER_METHOD_CANNOT_HAVE_A_WILDCARD_RETURN_TYPE=A producer method cannot have a return type parameterized with wildcards. Method {0}
 CANNOT_LOAD_CLASS=Cannot load class {0} during deserialization of proxy
 PROXY_DESERIALIZATION_FAILURE=Failed to deserialize proxy object
 BEAN_INSTANCE_NOT_SET_ON_PROXY=Method call requires a BeanInstance which has not been set for this proxy {0}

diff --git a/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties b/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties
@@ -24,7 +24,7 @@ THREADS_IN_USE=Using {0} threads for bootstrap
 INVALID_THREAD_POOL_SIZE=Invalid thread pool size: {0}
 TIMEOUT_SHUTTING_DOWN_THREAD_POOL=Timeout shutting down thread pool {0} at {1}
 INVALID_THREAD_POOL_TYPE=Invalid thread pool type: {0}
-INVALID_PROPERTY_VALUE=Invalid value for property {0}: {1} 
+INVALID_PROPERTY_VALUE=Invalid value for property {0}: {1}
 DUPLICATE_ANNOTATED_TYPE_ID=Two AnnotatedType implementations with the same id: {0}, {1}, {2}
 ANNOTATED_TYPE_JAVA_CLASS_MISMATCH=Cannot replace AnnotatedType for {0} with AnnotatedType for {1}
 PRIORITY_OUTSIDE_OF_RECOMMENDED_RANGE=Priority {0} specified at {1} is outside of the recommended range (0 - 3099)
diff --git a/impl/src/main/resources/org/jboss/weld/messages/event_en.properties b/impl/src/main/resources/org/jboss/weld/messages/event_en.properties
@@ -1,5 +1,5 @@
 ASYNC_FIRE=Sending event {0} directly to observer {1}
-ASYNC_TX_FIRE=Sending event {0} asynchronously to transactional observer {1} 
+ASYNC_TX_FIRE=Sending event {0} asynchronously to transactional observer {1}
 ASYNC_OBSERVER_FAILURE=Failure while notifying an observer of event {0}
 PROXY_REQUIRED=Proxy required
 INVALID_SCOPED_CONDITIONAL_OBSERVER=Conditional observer method [{0}] cannot be declared by a @Dependent scoped bean

diff --git a/impl/src/main/resources/org/jboss/weld/messages/metadata_en.properties b/impl/src/main/resources/org/jboss/weld/messages/metadata_en.properties
@@ -11,6 +11,6 @@ SCOPE_NULL=BeanAttributes.getScope() returned null for {0}
 NOT_A_STEREOTYPE={0} defined on {1} is not a stereotype
 NOT_A_QUALIFIER={0} defined on {1} is not a qualifier
 TYPES_EMPTY=BeanAttributes.getTypes() may not return an empty set {0}
-NOT_A_SCOPE={0} defined on {1} is not a scope annotation 
+NOT_A_SCOPE={0} defined on {1} is not a scope annotation
 METADATA_SOURCE_RETURNED_NULL={0} returned null for {1}
 INVALID_PARAMETER_POSITION=Parameter position {0} of parameter {1} is not valid
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-parent</artifactId>
-        <version>21</version>
+        <version>22</version>
     </parent>
 
     <prerequisites>
@@ -40,7 +40,6 @@
         <cdi.api.version>1.1-20130305</cdi.api.version>
         <cdi.tck-1-0.version>1.0.4.SP3</cdi.tck-1-0.version>
         <cdi.tck-1-1.version>1.1.0-SNAPSHOT</cdi.tck-1-1.version>
-        <checkstyle.plugin.version>2.9.1</checkstyle.plugin.version>
         <classfilewriter.version>1.0.4.Final</classfilewriter.version>
         <contiperf.version>1.06</contiperf.version>
         <findbugs-maven-plugin.version>2.5.1</findbugs-maven-plugin.version>
@@ -77,7 +76,6 @@
     </properties>
 
     <modules>
-        <module>build-config</module>
         <module>impl</module>
     </modules>
 
@@ -521,34 +519,6 @@
                     <artifactId>selenium-maven-plugin</artifactId>
                     <version>${selenium.maven.plugin.version}</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>${checkstyle.plugin.version}</version>
-                    <configuration>
-                        <configLocation>weld-checkstyle/checkstyle.xml</configLocation>
-                        <consoleOutput>true</consoleOutput>
-                        <failsOnError>true</failsOnError>
-                        <useFile />
-                    </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.jboss.weld</groupId>
-                            <artifactId>weld-build-config</artifactId>
-                            <version>${project.version}</version>
-                        </dependency>
-                    </dependencies>
-                    <executions>
-                        <execution>
-                            <id>check-style</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>checkstyle</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
                 <!-- So m2e doesn't throw errors for features it doesn't support in the
                     POM -->
                 <plugin>

diff --git a/porting-package/1.1/src/main/resources/META-INF/cdi-tck.properties b/porting-package/1.1/src/main/resources/META-INF/cdi-tck.properties
@@ -1,4 +1,4 @@
-# CDI TCK configuration - porting package 
+# CDI TCK configuration - porting package
 org.jboss.cdi.tck.spi.Managers=org.jboss.weld.tck.ManagersImpl
 org.jboss.cdi.tck.spi.Beans=org.jboss.weld.tck.BeansImpl
 org.jboss.cdi.tck.spi.Contexts=org.jboss.weld.tck.ContextsImpl